OSDN Git Service

Merge branch 'muskox-master'
authorAriejan de Vroom <ariejan@ariejan.net>
Sat, 29 Jun 2013 13:37:51 +0000 (16:37 +0300)
committerAriejan de Vroom <ariejan@ariejan.net>
Sat, 29 Jun 2013 13:37:51 +0000 (16:37 +0300)
Closes #4424


Trivial merge