Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 23 Jan 2015 07:32:10 +0000 (08:32 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 23 Jan 2015 07:32:10 +0000 (08:32 +0100)
commit0ef6b519d07f99c8176f5edd59ea3158956cc7b3
tree4b2a6de09f4e2661ccb0bdb978b7d7566db64185
parent0b4b1f4c8a098531b11da00d2162ffaef4933a7f
parent01b4e844b8991b2f660e89adceed03ca0db9491a
Merge branch 'master' of github.com:kivitendo/kivitendo-erp