Merge branch 'pflichtenhefte'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 May 2014 11:08:28 +0000 (13:08 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 May 2014 11:08:28 +0000 (13:08 +0200)
commit766f5705ecb9cd56adfbffd94c871959bb64c6fd
tree0ec13b46b55c1ceaa0691fea0ffcdd856d0b2cb1
parent48786831ad9ad95a229e6a9f7eb92fd0f3f3ec9e
parentcbf105b2340879d2381b81148f2cbfe16dfdffbf
Merge branch 'pflichtenhefte'

Conflicts:
js/locale/de.js
SL/DB/Part.pm
SL/InstallationCheck.pm
SL/OE.pm
bin/mozilla/oe.pl
js/locale/de.js
locale/de/all