Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Nov 2012 23:01:32 +0000 (00:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Nov 2012 23:01:32 +0000 (00:01 +0100)
commit0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4
treee79ee2f20f2be8f0a45739d06f2e7480bd00ad5d
parentf0a4269bfee8bce9904abe62144bc377ca7aab14
parent9724a0bcd4e962d109fa3effb7b4a82aa7d420b6
Merge remote-tracking branch 'origin/next' into thirteen