- Added another example to .gitignore for Windows build
Merge remote-tracking branch 'remotes/upstream/master'
Merge pull request #488 from lukase/master

Small .gitignore update for Windows
Resync with trunk