Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:43 +0000 (15:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:43 +0000 (15:18 +0200)
commit080568824d60c86189a49d272a390f81c86a0eba
treecd21e63a2944864af82fd738e6c9a6c5c1c93397
parent0f7ee3ea4e63a646ae5d02207530493016240f43
parent1a200cffc994858c8cad91b9b00093d24f00e79a
Merge remote-tracking branch 'origin/master' into next