Merge branch '3661-copy-move-from-show' refs #3661
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:17:31 +0000 (17:17 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:18:07 +0000 (17:18 -0400)

Trivial merge