commit 53c92808c3b7c638aaaea2617b9843bccf83cb5c Merge: 06250ea c8cddbb Author: Mads Kiilerich <mads at kiilerich.com> Date: Sun Aug 8 23:30:44 2010 +0200 Merge remote branch 'origin/f13/master' Conflicts: tortoisehg.spec ---