Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 11 Dec 2014 00:18:22 +0000 (16:18 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 11 Dec 2014 00:18:22 +0000 (16:18 -0800)
commitfa0223015fe6c03491b1d0d43524e03ac5fdb899
treed56cf20b2f69b84016bfe3f5ade7b63ac61b88b2
parent2b213128f191f52dc7b7ad6ada5fb845e42dc632
parente28aac72a20271f60b8f628e29e4908dcfe2b05c
Merge branch 'master' of git.freeside.biz:/home/git/freeside