Merge origin/master

Conflicts:
	.gitignore
This commit is contained in:
vilius 2014-03-31 16:50:01 +03:00
parent 1675a9d1dc
commit d7994166e2

1
.gitignore vendored
View File

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