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)
Slideshow picture with video rework


Trivial merge