Merge remote-tracking branch 'origin/master' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:31 +0000 (23:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:31 +0000 (23:54 +0200)
1  2 
html/cgi-bin/services.cgi

Simple merge