Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 Dec 2013 15:36:23 +0000 (16:36 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 Dec 2013 15:36:23 +0000 (16:36 +0100)
commit8317fdf49404110c9f15c93d469c83e5bb0235e7
treecdb16101762bf5f3bb993e11cf90bc63041388cf
parent09f89fc0182e17953ec27b15b38d2c8b1e59c667
parentb671b160f38e249bf35a1cffd186fcf69a21de92
Merge branch 'master' of github.com:kivitendo/kivitendo-erp