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

Trivial merge