Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)
commit1d12008db5c86f06c70600ea2ac9cc0721af6d9b
tree0da900fab5dfe4001188b9b9b506a61a4565164c
parentecd0ac08a56363fd779bcd08d70a4720f99a33db
parentfe3a05da3a794e3025fde4b39775876835ad735a
Merge remote-tracking branch 'origin/next' into thirteen