OSDN Git Service

Merge main.
authorrui Batista <ruiandrebatista@gmail.com>
Tue, 24 Apr 2012 15:00:02 +0000 (16:00 +0100)
committerrui Batista <ruiandrebatista@gmail.com>
Tue, 24 Apr 2012 15:00:02 +0000 (16:00 +0100)

Trivial merge