OSDN Git Service

Merged main.
authorrui Batista <ruiandrebatista@gmail.com>
Sun, 11 Nov 2012 11:55:41 +0000 (11:55 +0000)
committerrui Batista <ruiandrebatista@gmail.com>
Sun, 11 Nov 2012 11:55:41 +0000 (11:55 +0000)
commit2952d2c7cb2ae852d1f4313e07e999cddbb795e6
tree4dace0911f7aed2d00f5676d92e3138428b5c814
parent5b0f64922f1fb45c2c990002dea61639425755c9
parent9950141d8ae2416703bc16c49cd7fe8dd13b18ac
Merged main.