Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 12:46:11 +0000 (13:46 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 12:46:11 +0000 (13:46 +0100)
commit4bf8886f5004121c1fb31cbb93907dee44005c57
treef11f00c881dc3f96f06ee61f7ca591446916b221
parent56a48a8428b904f32b1e637951059710faeba6bd
parent5a8cc659f8de6bd2f875ad97ccce90b2d3902009
Merge branch 'master' of github.com:kivitendo/kivitendo-erp