OSDN Git Service

Merge branch 'master' into stable 3-1-stable
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 22 Nov 2012 10:52:08 +0000 (12:52 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 22 Nov 2012 10:52:08 +0000 (12:52 +0200)
Conflicts:
doc/install/installation.md


Trivial merge