OSDN Git Service

Merge branch 'master' into relative
authorMarin Jankovski <marin@gitlab.com>
Tue, 12 Nov 2013 08:26:17 +0000 (09:26 +0100)
committerMarin Jankovski <marin@gitlab.com>
Tue, 12 Nov 2013 08:26:17 +0000 (09:26 +0100)

Trivial merge