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

[Mads Kiilerich]

commit 7f1179ae091e597fc0d65eab2ce9ef4867e9562b
Merge: 87713c4 66252f6
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sun May 6 00:39:45 2012 +0200

    Merge branch 'f17'

 tortoisehg.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---