OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorAriejan de Vroom <ariejan@ariejan.net>
Thu, 1 Mar 2012 14:09:23 +0000 (15:09 +0100)
committerAriejan de Vroom <ariejan@ariejan.net>
Thu, 1 Mar 2012 14:09:23 +0000 (15:09 +0100)

Trivial merge