Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 10 May 2013 11:59:55 +0000 (13:59 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 10 May 2013 11:59:55 +0000 (13:59 +0200)
commit245d5036b6fbc2c9e4692244aff22d5188771e09
tree093ce3c9c7e5c847fbd243d3c7a234de449285a1
parent33a49f86be5d3e42a28c74bf862220fcc143b286
parent17f39e02a0d2b7ceb565258861217fa7ba6bfbcf
Merge branch 'master' of github.com:kivitendo/kivitendo-erp