Merge remote-tracking branch 'drebs/feature/improve-exceptions-names-and-handling...
authorTomás Touceda <chiiph@leap.se>
Mon, 25 Nov 2013 20:49:19 +0000 (17:49 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 25 Nov 2013 20:49:19 +0000 (17:49 -0300)

Trivial merge