OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorKoushik Dutta <koushd@gmail.com>
Sun, 13 Jan 2013 02:25:19 +0000 (18:25 -0800)
committerKoushik Dutta <koushd@gmail.com>
Sun, 13 Jan 2013 02:25:19 +0000 (18:25 -0800)

Trivial merge