Merge branch 'master' into sf
authoradam <anton@adamansky.com>
Mon, 12 Nov 2012 06:15:54 +0000 (13:15 +0700)
committeradam <anton@adamansky.com>
Mon, 12 Nov 2012 06:15:54 +0000 (13:15 +0700)
commit6e72a4c421ab62c4a77522b45248d22648561df9
tree84e025bc8c16244531c565817b1ca2fa6bf5008e
parent1e54437440740f87007f9e2300db18752ecf1fd4
parent2ec418adadcef360b50bdc0f739fa92d7da5feef
Merge branch 'master' into sf