Arne Fitzenreiter f0728c790f Merge remote-tracking branch 'origin/master' into next ...

Conflicts:
	config/cfgroot/general-functions.pl

2014-07-29 22:01:19 +02:00

..

cgi-bin

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

2014-07-29 22:01:19 +02:00

html

theme: Fix spacing of version string in footer.

2014-05-10 14:25:36 +02:00