projects / meabook / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13dda03 527283d)
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)

Trivial merge
Unnamed repository; edit this file to name it for gitweb.