tree ce4d2836e01f203294983425b97c0a06397431fd
parent 5fda5fdf12473e16384b8c4026e93d41734373d7
author Andrey Somov <public.somov@gmail.com> 1247056916 +0200
committer Andrey Somov <public.somov@gmail.com> 1247056916 +0200

merge changes that were not automatically discovered by Mercurial