Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 16 Sep 2014 03:55:19 +0000 (20:55 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 16 Sep 2014 03:55:19 +0000 (20:55 -0700)
commit4e7efe58f1a20dfc4fd306fad2c14c8040585be1
tree20021a00657542d4568ead7fee5d1b536c82b19c
parentbdc63b4ee68fb08d3ef281212bdffac2bc038717
parent53288cefda78454e909759823d5e8cc6e2214bad
Merge branch 'master' of git.freeside.biz:/home/git/freeside