Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan-debian@420.am>
Thu, 15 Mar 2012 20:56:48 +0000 (13:56 -0700)
committerIvan Kohler <ivan-debian@420.am>
Thu, 15 Mar 2012 20:56:48 +0000 (13:56 -0700)

Trivial merge