Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
authorMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:43:07 +0000 (11:43 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:43:07 +0000 (11:43 -0700)
commit84bccd4ca40cec59e1f762cff000b6f026c7f182
tree8f0d902179a7e698e203cce17cf9f4b4636d9fa9
parent42cd1e75913d668765a895df15e3f5286f2f1d0f
parent378d4792d22af7c538e53fabcda58b344044d188
Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3