commit d9b03ff0de5a629279b2b2a8cc1c4b7f4cfb0995 Merge: f71c50e 4fbf055 Author: Martin Gansser <mgansser at alice.de> Date: Sat Jan 18 12:34:37 2014 +0100 Merge branch 'master' into f20 ---