commit 5361f0cb41dfb4f3d1b2b7c81d5883ac7dbd6053 Merge: 1ddeb8b a1b9599 Author: Stu Tomlinson <stu at nosnilmot.com> Date: Thu Jul 5 18:10:10 2012 +0100 Merge branch 'f15' of ssh://pkgs.fedoraproject.org/pidgin into f15 ---