Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 13 Jun 2013 10:02:51 +0000 (12:02 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 13 Jun 2013 10:02:51 +0000 (12:02 +0200)
commitaec1ea5969912e120e8e3c13210d5918f14fbd89
tree08cb1e33eff92228f091368745f9ce16a855b0fd
parent0a963710566615bf374afb38fdde87162f9ef075
parentf383c4239b5f1f41d47e8bd92814fb9f241760ad
Merge branch 'master' of github.com:kivitendo/kivitendo-erp