Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 27 Jun 2014 11:48:32 +0000 (13:48 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 27 Jun 2014 11:48:32 +0000 (13:48 +0200)
commitfa7fc7eeb3ca718914affee06c0629a08d571288
tree1f798e9cf1e7fff91cda4ddd4a68a063ab925ea2
parent9c1e389807fe1e1fbadbcffcdd3332b841fc9035
parent98896d5618c1932ced0107da5db5071d971d91b1
Merge branch 'master' of github.com:kivitendo/kivitendo-erp