Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 2 Dec 2013 01:25:30 +0000 (17:25 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 2 Dec 2013 01:25:30 +0000 (17:25 -0800)
commitec02246ea0218838def2b12b0b987f71662d1761
tree0f0b5be6f12006a31af2a8801b747f476b7eccb2
parent281d78519501a96934a500270810d4af5b4aaa73
parentb02c42c401382cdf35bfb81abd4ffabbbacfd5c9
Merge branch 'master' of git.freeside.biz:/home/git/freeside