Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
authorMark Wells <mark@freeside.biz>
Thu, 7 Mar 2013 22:45:13 +0000 (14:45 -0800)
committerMark Wells <mark@freeside.biz>
Thu, 7 Mar 2013 22:45:13 +0000 (14:45 -0800)
commit788f67e1d0a83e5554273dc946d80f5badccda4c
treebed42531e52c62a35e35c765c144cc7fc6837e37
parentf80829f3cee324b94974bdf2b2d7682e411715b9
parente07eba0d44fbe13505c3df373fd7d29515b74fec
Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3