Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan-debian@420.am>
Thu, 15 Mar 2012 20:56:48 +0000 (13:56 -0700)
committerIvan Kohler <ivan-debian@420.am>
Thu, 15 Mar 2012 20:56:48 +0000 (13:56 -0700)
commit7d68066ea33f9f85fe14ce663372642d7ec2ad20
treef659173a23d541da3032f8a8156f888810d7efda
parentd622dc369cc0856fb791658b35f889470a7da605
parenta69299c596de60f4b26db7431165f7f3ffe928e2
Merge branch 'master' of git.freeside.biz:/home/git/freeside