OSDN Git Service

Merged main.
authorrui Batista <ruiandrebatista@gmail.com>
Tue, 27 Nov 2012 12:23:46 +0000 (12:23 +0000)
committerrui Batista <ruiandrebatista@gmail.com>
Tue, 27 Nov 2012 12:23:46 +0000 (12:23 +0000)

Trivial merge