OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorAriejan de Vroom <ariejan@ariejan.net>
Mon, 23 Jan 2012 08:38:49 +0000 (09:38 +0100)
committerAriejan de Vroom <ariejan@ariejan.net>
Mon, 23 Jan 2012 08:38:49 +0000 (09:38 +0100)

Trivial merge