Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 10 Mar 2015 17:03:38 +0000 (18:03 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 10 Mar 2015 17:03:38 +0000 (18:03 +0100)
commitfea73b796d2289979be90dfc808346ec10a008f6
treec533bc2e635e4df1dc04e51ffa7f04c20f37c9cc
parent3ca78c165eb22113110ab1f1cc716ac7e18cdbdc
parent94ad4ae03583feb4a65dc27377b465c0e2c2535c
Merge branch 'master' of github.com:kivitendo/kivitendo-erp