Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)
commit2efd0cd68aa23e977a57b9cdb4177c3dc2d30edf
treecb4768b2d61cc3521a9e4a1c7fafafb88121ef35
parentfc992179a15a53c920d8f18e276624c0ace6a6ec
parentb88cd7caa1a8b2975804ff2923fd98c1a4eb1640
Merge remote-tracking branch 'origin/next' into thirteen