Missing echo in basic theme
Merge branch 'master' of https://github.com/zenphoto/zenphoto
#834 as of @ntsikerdanos suggestion
CSS conflict fix for slideshow2 and theme based custom icon fonts
Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from sbillard/master

Mostly Imagic fix