Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 28 Aug 2014 12:18:33 +0000 (14:18 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 28 Aug 2014 12:18:33 +0000 (14:18 +0200)
commit89360aadb2c3e0854a2815e5d0ed8a9efd1c5889
tree74d0de20e689509e7dcd73e7107a0ce83f46598f
parentd109d6fe416ac863a35c8b932b593a244a38fbf1
parent9e561023f96c1b6fa8a3f5148522a53a874aabd6
Merge branch 'master' of github.com:kivitendo/kivitendo-erp