Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 3 Feb 2013 20:27:46 +0000 (12:27 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 3 Feb 2013 20:27:46 +0000 (12:27 -0800)
commit855e05d13c8fb11862a6961ceccf426939ebe5cc
treea8db4363cc61deb35ee3427a90d9504e9ef7e430
parentc1212f339a1618b139a57589af5e48a72a46d96a
parente6501937a8fc0af8583638226599e2857dd4f023
Merge branch 'master' of git.freeside.biz:/home/git/freeside