commit 996b3c7dd9ddc86815e7aa22f75abf9fc64b069b Merge: 933dca4 bec2991 Author: Paul P. Komkoff Jr <i at stingr.net> Date: Wed Aug 25 17:30:14 2010 +0100 Merge remote branch 'origin/f13/master' Conflicts: weechat.spec ---