Commit 5711ca93d13b74767788c0d7d68fb948e0f9e170

Vicent Marti 2011-05-09T21:58:26

Merge branch 'error-handling' into development