Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorAndreas Rudin <andreas.rudin@revamp-it.ch>
Fri, 24 Jun 2016 20:47:52 +0000 (22:47 +0200)
committerAndreas Rudin <andreas.rudin@revamp-it.ch>
Fri, 24 Jun 2016 20:47:52 +0000 (22:47 +0200)
commit6fbc826886eed02e1cf23efd88e684e3223414fc
treea0b5df02f47dfff574f0d6fede2ee2d8290d62e1
parent3b9df0fd8b53a84028854586830057d47b9572b8
parent2fdcbcbdd7fb587f88adeb90c177b9194705bf2f
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp