Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 26 Dec 2012 18:05:28 +0000 (10:05 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 26 Dec 2012 18:05:28 +0000 (10:05 -0800)
commitd7e62d5ea2b5d3f3c7b8ba3da39cce1a606dc3d3
treef38de33cf12eef26757a5b4e21f4ea12322173c6
parented3f4acc185d842d4d656b508e364db918378240
parent9cedd28800e1c77dd53adab3027494a6f2e1b2cf
Merge branch 'master' of git.freeside.biz:/home/git/freeside