OSDN Git Service

Merge branch '6-1-stable'
authorMarin Jankovski <maxlazio@gmail.com>
Sun, 22 Sep 2013 08:49:32 +0000 (10:49 +0200)
committerMarin Jankovski <maxlazio@gmail.com>
Sun, 22 Sep 2013 08:49:32 +0000 (10:49 +0200)

Trivial merge