Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 2 Jun 2014 12:10:21 +0000 (14:10 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 2 Jun 2014 12:10:21 +0000 (14:10 +0200)
commitadb2f4cd6b1da8c8bc7f53be89ced2fa649b512f
tree528ae49ab50a3a9bc73a24158afbb6b3ea2b7f6b
parentf5701b02123494f8dacbea8c5de00cf7a6edba70
parent23711649c4bbb31443d5cc275d5bda092bdb5b80
Merge branch 'master' of github.com:kivitendo/kivitendo-erp