Merge remote branch 'upstream/master'

Andrey Nakin

2013-10-21 6054f2efebb898bbd32ab7388eae7b9ff4357b0a

 .gitignore

@@ -16,6 +16,7 @@
*.out
*.app
*.test
examples/*/test

# Backup files
*~