OSDN Git Service

Merge remote-tracking branch 'github/master'
authorLennart Rosam <lennart.rosam@medien-systempartner.de>
Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)
committerLennart Rosam <lennart.rosam@medien-systempartner.de>
Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)

Trivial merge