Merge branch 'master' into view/suspended/2008-expeditionmasterview/suspended/2008-expedition@vaio/view/suspended/2008-expedition
| commit | 573dfe635dfe710b8f59afd4c615cfd4886396a1 | |
| author | Ivan Zakharyaschev <imz@altlinux.org> | |
| Mon, 20 Apr 2009 16:14:19 +0000 (20 20:14 +0400) | ||
| committer | Ivan Zakharyaschev <imz@altlinux.org> | |
| Mon, 20 Apr 2009 16:14:19 +0000 (20 20:14 +0400) | ||
| tree | c7c15169056ca845e334ecb1754491a29ac827c0 | treesnapshot (tar.gz zip) |
| parent | d6e401d6fde8eeeeb66375dba689a144712f2a0f | commitdiff |
| parent | 1e1568a4621c58ef24ffee44062f7a113b8f22c4 | commitdiff |
Merge branch 'master' into view/suspended/2008-expedition
Conflicts:
phono-notes-izhma.tex
Conflicts:
phono-notes-izhma.tex
| phono-notes-izhma.bbl | diff1 | blobhistory | |
| phono-notes-izhma.pdf | diff1 | blobhistory | |
| phono-notes-izhma.tex | diff1 | diff2 | blobhistory |
| phono-notes-izhma_more.txt | diff1 | blobhistory |