Merge branch 'xtuple' into 22822
authorJohn Rogelstad <john@xtuple.com>
Sun, 2 Mar 2014 19:58:55 +0000 (14:58 -0500)
committerJohn Rogelstad <john@xtuple.com>
Sun, 2 Mar 2014 19:58:55 +0000 (14:58 -0500)
commitf6be745dcc76c58489330b0fe79500dfed9bd2f4
tree7d0a60fe94ef1c9131e9e5ad040892a56f438f2c
parentf002339d1671a08811fd672c6216728019656997
parentbd250bb7b163f11901dc202c55462a655ebede75
Merge branch 'xtuple' into 22822