Merge branch 'auftrag-loeschen-und-wiedervorlagen-2310'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 6 Jan 2014 16:14:14 +0000 (17:14 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 6 Jan 2014 16:14:14 +0000 (17:14 +0100)

Trivial merge