Merge remote-tracking branch 'drebs/bug/fix-error-returns' into develop
authorTomás Touceda <chiiph@leap.se>
Mon, 25 Nov 2013 13:50:21 +0000 (10:50 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 25 Nov 2013 13:50:21 +0000 (10:50 -0300)

Trivial merge