Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 15:31:31 +0000 (17:31 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 15:31:31 +0000 (17:31 +0200)
commit32f6b40f49f084318d614f868407c83c36f35e00
tree2e24a99e4e9b693dd847bcb31262db6ff1fc683a
parent2ee964a6f3f95f99120b758fd1fee3bdb3f27880
parentd31f77eae4c4646ef1a99c5f7e7ddc1654add27d
Merge branch 'master' of github.com:kivitendo/kivitendo-erp