Merge branch 'master' into nikitakit_master
authorNikita Kitaev <nikitakit@gmail.com>
Thu, 15 Apr 2010 23:23:23 +0000 (16:23 -0700)
committerNikita Kitaev <nikitakit@gmail.com>
Thu, 15 Apr 2010 23:23:23 +0000 (16:23 -0700)
commitc11c4966980ed301f40b3dcc24e4fbec525f93e3
treec0d5a3fe4b576f798e76238feaf80b77de6752e2
parent6de0a0a51c71b4e47e9c2f63e05ae9ca8295a57f
parentda2c3c1313524f14cd616a9bd31afecfb8f3abfb
Merge branch 'master' into nikitakit_master