concluding merge
authorJorge Soares <j.s.soares@gmail.com>
Thu, 27 Nov 2014 16:57:50 +0000 (16:57 +0000)
committerJorge Soares <j.s.soares@gmail.com>
Thu, 27 Nov 2014 16:57:50 +0000 (16:57 +0000)

Trivial merge