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

[Mads Kiilerich]

commit 4ee6c74eaf85daea365b8672ba69161ed48a2162
Merge: a1e2c63 a8b3161
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sat Jun 9 15:03:13 2012 +0200

    Merge branch 'f17'

 .gitignore      |    1 +
 sources         |    2 +-
 tortoisehg.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---