Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/.version
master
Sergey Dorofeev 13 years ago
commit 635e263dd5
Loading…
Cancel
Save