what did we change besides log4cxx
merged changes
Merge remote-tracking branch 'origin/master'
wix csharp custom action
Merge remote-tracking branch 'origin/master'