OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authormpeshev <mario@peshev.net>
Thu, 8 Aug 2013 13:34:51 +0000 (16:34 +0300)
committermpeshev <mario@peshev.net>
Thu, 8 Aug 2013 13:34:51 +0000 (16:34 +0300)

Trivial merge