Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)
commit6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e
treeb4cc57b662505083b1b4ec262c5c089fa80dbbc0
parent4598f16cfddf949149f4b00f554d8991a192a84f
parentbe5b660500596f860a6ba3478aac441b86f60626
Merge remote-tracking branch 'origin/next' into fifteen