Merge branch 'tg/next__redo_version_file' into next
authorToni Gundogdu <legatvs@gmail.com>
Thu, 29 Aug 2013 13:17:17 +0000 (29 16:17 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Thu, 29 Aug 2013 13:17:17 +0000 (29 16:17 +0300)

Trivial merge