Merge remote-tracking branch 'refs/remotes/ivan/feature/better-version-handling'...
authorTomás Touceda <chiiph@leap.se>
Mon, 20 Jan 2014 15:34:17 +0000 (12:34 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 20 Jan 2014 15:34:17 +0000 (12:34 -0300)

Trivial merge