Merge remote-tracking branch 'ms/thirteen' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)
commit68ad7a1ab89eeac485ca85667fb43db3c6431e34
treecf5bbe6de448e920a9185ce2440a4055132cfee1
parent12a8cc1ed90b108fbbcb2d1093e754f05e98bdc1
parent3d08d9377d220d4be9238270599fab53f8d66d1b
Merge remote-tracking branch 'ms/thirteen' into kernel-update