Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 11 Jan 2014 00:48:41 +0000 (16:48 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 11 Jan 2014 00:48:41 +0000 (16:48 -0800)
commit0ddb95ef7e09ada82657f30ce459fe229b2851c0
treeae091a52b94223f1c45cc9e193db546a282c6e27
parentc6c33c7044e7669d79721b567b51487eefa0cc12
parent5b670255328fbe875196e16bc8dfc57771753e90
Merge branch 'master' of git.freeside.biz:/home/git/freeside