Merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2012 18:12:41 +0000 (19:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2012 18:12:41 +0000 (19:12 +0100)
commit28bd5ee714ce2cb3660f46cc3da5a2af4a9e73e9
tree4752bddf1a62a8c4cee3c61fd4bd83e80244b1f5
parentb0a1528d5416e31dcb8ed174aaf372a9e37e3294
parentbfde7a8618e9cd3180c38142ff26e251e37d8502
Merge.
windows/installer.nsi.in