Merge branch 'my-origin/master'
authoratomizer <danila.gerasimov@gmail.com>
Mon, 7 Jan 2013 13:03:58 +0000 (17:03 +0400)
committeratomizer <danila.gerasimov@gmail.com>
Mon, 7 Jan 2013 13:03:58 +0000 (17:03 +0400)
commit119d536e07b01aa96636509d3a8394a44640dc39
tree2da4196033494f3ab5f231f0088fbd84f4ce1734
parentfa1bf9c65315c0c5168652149a9decefdef1ba55
parent814eed0ea1f91815cec645d9eb6f79c841d541fb
Merge branch 'my-origin/master'