Merge branch 'filter-image-descriptions' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 12 Nov 2011 10:54:55 +0000 (11:54 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 12 Nov 2011 10:55:30 +0000 (11:55 +0100)
commit60926d0dc3b2139029c3fcb0b3d28caccf4b83b3
tree8c4bb75953562223fb212364f2a8a8694499eee1
parente9a873031c8362cf8cbd43e83639b2917c73e37c
parent3dc1b526bc547f89a8a9e5d67344e05ae7004d04
Merge branch 'filter-image-descriptions' into next

This resolves #239.