resolve merge conflicts
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:10:49 +0000 (15:10 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:10:49 +0000 (15:10 +0400)
commit5b3a72ba65fd7ac03fdece3cada03e9ac24cc436
tree24ee343229ba51ee5769e42b368e1b7e9b88cc17
parenta654306ba0d274ed0f415ae846498329f8a66e45
parent114b730277423f4f8aa82fa9e499b67064f71eb3
resolve merge conflicts
README