Michael Kaufmann (d00p) 0031e19c70 damn automatic merge...stupid thing ...

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

2013-12-22 19:24:40 +01:00

..

0.9

damn automatic merge...stupid thing

2013-12-22 19:24:40 +01:00

upgrade_syscp.inc.php

migrate more stuff to new Settings class, refs #1325

2013-12-15 14:38:53 +01:00