commit 8f1ce9d07be39f55cada7451764863304c2b8f88 Merge: 05a3c8e d9060ce Author: Nicholas van Oudtshoorn <vanoudt at gmail.com> Date: Thu Apr 3 14:38:45 2014 +0800 Merge branch 'master' of ssh://pkgs.fedoraproject.org/idzebra ---