OSDN Git Service

Merge branch '4-0-stable' into stable
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 23 Dec 2012 12:02:47 +0000 (14:02 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 23 Dec 2012 12:02:47 +0000 (14:02 +0200)

Trivial merge