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)
commitb38f6240891f78af59e2c5d25361ab67a73e000f
tree5b0f26e946da82519e4703eceeae007cd3c39e57
parent36043b37739dffdaea8d31457570810e492268d7
parent7efe10ec5fc772f5328b35ba6716bde815212b45
Merge remote-tracking branch 'origin/upstream'