Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 7 Mar 2013 11:42:48 +0000 (12:42 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 7 Mar 2013 11:42:48 +0000 (12:42 +0100)
commita6b4b406f0a9db0a1c719f4b7d5eb8265f90bf61
treeaaf356e9861baf8ae4b2f5c72d22f9b5d93d6303
parentcc06de5e9c5136936ff0abe2d92d72d2dd189d55
parentb0edfab29b884d824e8518ccf0256ca1776ad682
Merge branch 'master' of github.com:kivitendo/kivitendo-erp