Bugfix slideshow2: getShow method now correctly returns the slideshow data as it is supposed to do instead of wrongfully printing it right away.
Fix #831
images
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/template-functions.php

	modified:   zp-core/zp-extensions/slideshow2.php
Language specific tags
tag orders
flags
language specific tags
release notes update
Merge remote-tracking branch 'upstream/master'
Fix #831 actually by sbillard on the fork which I forgot to credit properly.
breadcrumbs
Revert "breadcrumbs"

This reverts commit 6ae2b2c12ff36c3a9b8fb78ecc0fbd9d48ac5b47.
Revert "Revert "breadcrumbs""

This reverts commit 0e58b4b1a0e492164f01fa49c5cf64c97634e874.
theme issues
Merge remote-tracking branch 'upstream/master'
restore comment space

This line was removed by the upstream merge. It really should remain for
readability.
Merge pull request #34 from sbillard/master

various