OSDN Git Service

Merge branch 'feature_312'
authorValery Sizov <vsv2711@gmail.com>
Sat, 7 Jan 2012 11:24:27 +0000 (13:24 +0200)
committerValery Sizov <vsv2711@gmail.com>
Sat, 7 Jan 2012 11:24:27 +0000 (13:24 +0200)

Trivial merge