Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 12:26:40 +0000 (13:26 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 12:26:40 +0000 (13:26 +0100)
commit094307a8ce3e7680a5b14ef17b5c1094a2555009
tree42a582ef64802bc56018da6f6dd88a9e0d6545c1
parentc08b6d2167ed415b5008f9892a67a23ec32f0fc6
parente07203821fb6db4d54d0396a0d14d1dbef94dbff
Merge branch 'master' of github.com:kivitendo/kivitendo-erp