Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jul 2015 11:13:01 +0000 (13:13 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jul 2015 11:13:01 +0000 (13:13 +0200)
commit96f2dabc7d64e28c74358fb5745a6c68b18527f3
tree39a5b2ee1209c69027f0afd93d7a4dc2589538fe
parent0bae9fe6eb53a230c2f2e32b9d2975b1bc8fe64c
parent2ad2d77d0a1f588c03acc8fd05c1817b70a99e27
Merge branch 'master' of github.com:kivitendo/kivitendo-erp