Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 29 Aug 2012 22:19:17 +0000 (15:19 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 29 Aug 2012 22:19:17 +0000 (15:19 -0700)
commit33aa032478e29000c8c0d4fbe7bf8cb25c277606
treedca9779a3f3990ee26268575bb135081f9f1b23c
parent0e17277ed0cc243452dfc07d1bd702502c7d50c3
parent36e4318e1ccec27ae76a3d1505718a3d47af67c9
Merge branch 'master' of git.freeside.biz:/home/git/freeside