Merge branch 'release-0.3.2' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Fri, 6 Sep 2013 18:34:13 +0000 (15:34 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Fri, 6 Sep 2013 18:34:13 +0000 (15:34 -0300)

Trivial merge