Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 8 Jan 2014 11:42:33 +0000 (12:42 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 8 Jan 2014 11:42:42 +0000 (12:42 +0100)
commitcca9bcd19f7034fb1b06f6e55f95b6d8a72296ff
tree936b1d3bbe351c8603800ce52a47e8874101e69c
parent67e30bc6ea4cd05775f927f89946f8368b69e712
parent6573d4a45ddef660c04b34e37409bd1d90ded054
Merge branch 'master' of github.com:kivitendo/kivitendo-erp