Merge branch 'master' into multiroot_branch
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 20 Jan 2012 11:27:42 +0000 (14:27 +0300)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 20 Jan 2012 11:27:42 +0000 (14:27 +0300)
commit7bf695d384688124e9680c6f36d21c758b3ef86a
treee746500339893ae09fce7ede31ac2ffe11c0621f
parent73bda281c3a05f415557eac5340ead43534d9218
parentc29f2fd21ce36f52e09b5c850a725bc9911ee76d
Merge branch 'master' into multiroot_branch