Merge branch '4088-collection-show-files-filter'
authorTim Pierce <twp@curoverse.com>
Thu, 6 Nov 2014 19:14:35 +0000 (14:14 -0500)
committerTim Pierce <twp@curoverse.com>
Thu, 6 Nov 2014 19:14:35 +0000 (14:14 -0500)
commit308a6da1a9fd716f3957b116110a932c08aefafe
treea517720c4458fdfe1e4ae6cfe0da036e80646bda
parent00767fe5d84a51fdd6d734e2842552a37bff01e5
parent5b5c9a43929d392f32f7a4db1393df2dd106cbeb
Merge branch '4088-collection-show-files-filter'

Fixes #4088.