OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sun, 19 May 2013 00:43:05 +0000 (02:43 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Sun, 19 May 2013 00:43:05 +0000 (02:43 +0200)

Trivial merge