Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 10 Jan 2013 00:22:41 +0000 (16:22 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 10 Jan 2013 00:22:41 +0000 (16:22 -0800)
commit85ce878a87e2da7ed3e2f927cae7745ef3b59cc0
treee824c6e4a069c702a476141cc5ab05d9c19b296c
parent27ed323fad9fca12f507a524e1788fb37e36501e
parentbaa48df835b04f1aee3f9cd2c03f00e780585f13
Merge branch 'master' of git.freeside.biz:/home/git/freeside