OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorTam Dinh Thai Minh <tamdinh@gmail.com>
Sat, 15 Dec 2012 06:57:07 +0000 (13:57 +0700)
committerTam Dinh Thai Minh <tamdinh@gmail.com>
Sat, 15 Dec 2012 06:57:07 +0000 (13:57 +0700)

Trivial merge