Merge remote-tracking branch 'refs/remotes/meskio/doc' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 8 Jul 2014 17:18:53 +0000 (14:18 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 8 Jul 2014 17:18:53 +0000 (14:18 -0300)

Trivial merge