Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 3 Mar 2014 10:17:58 +0000 (11:17 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 3 Mar 2014 10:17:58 +0000 (11:17 +0100)
commit95ffbe43dbee258ae2d251eafdecd55eb79ac1d5
treeaa7927b27095d1766b90f014fa064b8cf2997ba6
parentce5cfaad14985b0569ae777632aa111c5ad24fe7
parent8cfebdfabd53d6234392298fa3f76ada02dbc845
Merge branch 'master' of github.com:kivitendo/kivitendo-erp