Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000 (17:04 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000 (17:04 +0100)
commit534fb55f9d0a212c5d857eb3eccabe5c08df1ba1
tree070f06da8459c0b007e14b6078482c11187f6d5b
parent1e1cdd5840d352b8bcb6b9587af0b6ab8232dbc7
parenteead8d2e01061b462f1758e06e7082ca5d18e523
Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
make.sh
make.sh