fixed conflicts with master
authorMax Usachev <maxusachev@gmail.com>
Thu, 24 Jun 2010 13:14:42 +0000 (16:14 +0300)
committerMax Usachev <maxusachev@gmail.com>
Thu, 24 Jun 2010 13:14:42 +0000 (16:14 +0300)
commit3a71c3119edd559da63b6e7f49374ecd4807f2dc
treeddf7b8c5aec347461985c922035aa3a74061fd2d
parent13dda03da9e097650d33b253c5d102d5ba1cdb8d
parent527283d0dffb12f226e26b0f5665ff5f57e0713f
fixed conflicts with master