resolve merge with master
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:21:28 +0000 (15:21 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:21:28 +0000 (15:21 +0400)
commit0f70200b5749abf01e2fa8666950bba3b636ed53
tree97c34e548984b25edce6468106491b529f9b39a3
parent5b3a72ba65fd7ac03fdece3cada03e9ac24cc436
parentadb19607664b7a5db5426735c90c702367d68613
resolve merge with master
README