Merge branch 'master' of git@gitorious.org:git-shortcuts/mainline@gitorious/master
commit636b5ddd6d6936c07239d0a0cc883925dae862fb
authorIvan Zakharyaschev <imz@altlinux.org>
Mon, 20 Apr 2009 23:47:37 +0000 (21 03:47 +0400)
committerIvan Zakharyaschev <imz@altlinux.org>
Mon, 20 Apr 2009 23:47:37 +0000 (21 03:47 +0400)
tree4bce507d4fe8a76bbe8d6e318adde6b355674ff0
parent486fe7b42fe81d63bd2e87a67b42d985fb274496
parent4f20e78153c6b95a7b0a306ef3596d69655d665d
Merge branch 'master' of git@gitorious.org:git-shortcuts/mainline