Merge branch 'master' into ticket21
authorVyacheslav Tyutyunkov <tyutyunkov@gmail.com>
Fri, 29 Mar 2013 10:03:04 +0000 (17:03 +0700)
committerVyacheslav Tyutyunkov <tyutyunkov@gmail.com>
Fri, 29 Mar 2013 10:03:04 +0000 (17:03 +0700)
commit8c97dd59049ff0fcc4d4f8a1c1b3dbc6b5ebea0a
tree0a6e5b9a5af00ba3dfc6483c22dd7f2fd7672a1e
parentfc0f8c966e9e56496d575dbe1fd1d2306bc0fb3c
parent841990e58bb90ad72bca93f381d373058b6604d7
Merge branch 'master' into ticket21