OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorvinhtantran <vinhtantran@gmail.com>
Fri, 8 Mar 2013 18:20:27 +0000 (11:20 -0700)
committervinhtantran <vinhtantran@gmail.com>
Fri, 8 Mar 2013 18:20:27 +0000 (11:20 -0700)

Trivial merge