merge bug19356 branch heads

Matthias Radestock · Matthias Radestock · commit 2d32da7a724f · 2009-08-29T05:39:50.000+01:00
diff --git a/.hgignore b/.hgignore
@@ -16,5 +16,5 @@ syntax: regexp
 ^wix/dotnet-client-merge-module\.wxs$
 ^wix/dotnet-client-product\.wxs$
 ^wix/License\.rtf$
-~$
 
+~$
