Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 30 Oct 2014 12:50:32 +0000 (13:50 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 30 Oct 2014 12:50:32 +0000 (13:50 +0100)
commitcb0e59e9819857b15d9bfcf051b1bb740bb6d1a2
tree79611182d646ceadce86966abb9a1ed6a5a948e0
parentb092fef706251cb7f7a10f45036e4b7b2a1bacb0
parent9338cfe573f7b65769008e5008a076286dd5d885
Merge branch 'master' of github.com:kivitendo/kivitendo-erp