[tortoisehg: 2/2] Merge branch 'f17'

[Mads Kiilerich]

commit dfbad54fb0bd0d21772a42cd1b7dabe3655b1ee5
Merge: 4ee6c74 2512584
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sun Jul 8 13:59:44 2012 +0200

    Merge branch 'f17'

 .gitignore      |    1 +
 sources         |    2 +-
 tortoisehg.spec |   10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
---