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)
This resolves #239.


Trivial merge