Merge branch 'slideshow'
authortanya <tanya@moshkanov.oblgaz>
Sat, 2 Oct 2010 21:16:26 +0000 (00:16 +0300)
committertanya <tanya@moshkanov.oblgaz>
Sat, 2 Oct 2010 21:16:26 +0000 (00:16 +0300)
commit85db82694e2bbdad49a86df98e5e2eca88a36d75
tree5fef99779a1c465cd40f85db5653cb6e9cd8b484
parentd3ba649a30941eab5eb3740afdc15e295f9d3fbc
parent32fcadc4aedf46e0991d484abcd20adf4f24f095
Merge branch 'slideshow'