Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 30 Aug 2012 07:48:19 +0000 (00:48 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 30 Aug 2012 07:48:19 +0000 (00:48 -0700)
commit708baebde34a2442ec41db38902e04f3c6ec4269
treed9b31a2372d82a4fdcaaf38a93986297e8e9003a
parent7c9457296c5dd8985eda5a8325ba1254223ec953
parent56fbf4de4af0a18b611daaa50e42b5dac047a937
Merge branch 'master' of git.freeside.biz:/home/git/freeside