Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)
commitfc992179a15a53c920d8f18e276624c0ace6a6ec
treef9e250ae32e206f78e79b30a7c9273cbf4534e39
parentd65e0bd38d3bf816c854d57d520bea9836959747
parent51379603c8161d5ef6ede182251789d098a3d833
Merge remote-tracking branch 'origin/next' into thirteen