OSDN Git Service

Merge remote-tracking branch 'origin/upstream'
authorWaldemar Brodkorb <wbx@openadk.org>
Mon, 8 Sep 2014 07:10:31 +0000 (09:10 +0200)
committerWaldemar Brodkorb <wbx@openadk.org>
Mon, 8 Sep 2014 07:10:31 +0000 (09:10 +0200)

Trivial merge