Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 27 Jun 2013 14:29:25 +0000 (16:29 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 27 Jun 2013 14:29:25 +0000 (16:29 +0200)
commitc85291ee4adfab9c21e5d780275221197365e120
tree3e9b9540ef7cd04a0c964cc3826b5b6ec4fce554
parent50aca900c2d569194e1718c1da9d1062dda9fd68
parenta0da7f1d521283359ccb3bf79ab52157c0cdc043
Merge branch 'master' of github.com:kivitendo/kivitendo-erp