Arne Fitzenreiter d7a3254ace Merge remote-tracking branch 'origin/next' into thirteen ...

Conflicts:
	config/rootfiles/common/stage2
	make.sh

2012-12-06 19:29:29 +01:00

..

cgi-bin

Merge remote-tracking branch 'origin/next' into thirteen

2012-12-06 19:29:29 +01:00

html

Revert "Some new icons for the webif (send in by traxxus)."

2011-05-28 11:57:49 +02:00