OSDN Git Service

Merge branch 'bbodenmiller-master'
authorAriejan de Vroom <ariejan@ariejan.net>
Sat, 29 Jun 2013 14:19:15 +0000 (17:19 +0300)
committerAriejan de Vroom <ariejan@ariejan.net>
Sat, 29 Jun 2013 14:19:15 +0000 (17:19 +0300)
Closes #4331


Trivial merge