Merge remote-tracking branch 'refs/remotes/ivan/feature/cleanup' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 26 Sep 2014 21:45:12 +0000 (18:45 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 26 Sep 2014 21:45:12 +0000 (18:45 -0300)

Trivial merge