Merge pull request #2580 from ulion/slideshow_picture_video_rework
authorjmarshallnz <jcmarsha@gmail.com>
Thu, 2 May 2013 19:32:34 +0000 (12:32 -0700)
committerjmarshallnz <jcmarsha@gmail.com>
Thu, 2 May 2013 19:32:34 +0000 (12:32 -0700)
commit40dabc2b9de680c543525dbaa9d4103107ac2647
tree949513a098895dfe0d55ef5e58293e868fa0a83b
parent83ac11995a0a918df193105403da6eda4ecf82a7
parent4b12bb686ad76b0cd2f03b3b67e37f340505b529
Merge pull request #2580 from ulion/slideshow_picture_video_rework

Slideshow picture with video rework