Merge origin/master

Conflicts:
	.gitignore
This commit is contained in:
vilius 2014-03-31 17:09:03 +03:00
parent 771a0b1886
commit a7a9a5ca17

1
.gitignore vendored
View File

@ -38,3 +38,4 @@ ehthumbs.db
Thumbs.db
nbproject/
.git/
77