commit 823b26b46008e2d3d99a503e0d4121bae105bd7e Merge: 1ddeb8b 88c2965 Author: Stu Tomlinson <stu at nosnilmot.com> Date: Thu Jul 5 18:09:21 2012 +0100 Merge branch 'f17' of ssh://pkgs.fedoraproject.org/pidgin into f17 ---