commit d66e30f2ec12d77f0f8ca2b0bfcf7f39178c5c9f Merge: 34a5875 ac23a3b Author: Martin Gansser <mgansser at alice.de> Date: Sun Jan 19 12:33:07 2014 +0100 Merge branch 'master' into f20 ---