Merge remote-tracking branch 'upstream/master'

Conflicts: source/.version
2012-03-10 21:46:30 +04:00 · 2012-03-10 21:46:30 +04:00 · 635e263dd5
commit 635e263dd5
parent e560e318f0 43e9d3f8e5
1 changed files with 0 additions and 1 deletions
--- a/source/.version
+++ b/source/.version
@ -1 +0,0 @@
 0.24