Remote themes
Merge
Merge https://github.com/schallalah/hin_und_zurueck

Conflicts:
	picolight/404.php
	picolight/footer.php
	picolight/functions.php
	picolight/header.php
	picolight/images/quote.png
	picolight/includes/theme-options.php
	picolight/index.php
	picolight/languages/de_DE.mo
	picolight/languages/de_DE.po
	picolight/languages/default.pot
	picolight/page.php
	picolight/readme.txt
	picolight/search.php
	picolight/searchform.php
	picolight/sidebar.php
	picolight/single.php
	picolight/style.css
	twentyeleven/404.php
	twentyeleven/archive.php
	twentyeleven/author.php
	twentyeleven/category.php
	twentyeleven/comments.php
	twentyeleven/content-aside.php
	twentyeleven/content-featured.php
	twentyeleven/content-gallery.php
	twentyeleven/content-image.php
	twentyeleven/content-intro.php
	twentyeleven/content-link.php
	twentyeleven/content-page.php
	twentyeleven/content-quote.php
	twentyeleven/content-single.php
	twentyeleven/content-status.php
	twentyeleven/content.php
	twentyeleven/footer.php
	twentyeleven/functions.php
	twentyeleven/header.php
	twentyeleven/image.php
	twentyeleven/inc/images/content-sidebar.png
	twentyeleven/inc/theme-customizer.js
	twentyeleven/inc/theme-options.php
	twentyeleven/inc/widgets.php
	twentyeleven/index.php
	twentyeleven/js/html5.js
	twentyeleven/languages/twentyeleven.pot
	twentyeleven/page.php
	twentyeleven/rtl.css
	twentyeleven/screenshot.png
	twentyeleven/search.php
	twentyeleven/searchform.php
	twentyeleven/showcase.php
	twentyeleven/sidebar-footer.php
	twentyeleven/sidebar-page.php
	twentyeleven/sidebar.php
	twentyeleven/single.php
	twentyeleven/style.css
	twentyeleven/tag.php
	twentythirteen/404.php
	twentythirteen/archive.php
	twentythirteen/author-bio.php
	twentythirteen/author.php
	twentythirteen/category.php
	twentythirteen/comments.php
	twentythirteen/content-aside.php
	twentythirteen/content-audio.php
	twentythirteen/content-chat.php
	twentythirteen/content-gallery.php
	twentythirteen/content-image.php
	twentythirteen/content-link.php
	twentythirteen/content-none.php
	twentythirteen/content-quote.php
	twentythirteen/content-status.php
	twentythirteen/content-video.php
	twentythirteen/content.php
	twentythirteen/css/editor-style.css
	twentythirteen/css/ie.css
	twentythirteen/footer.php
	twentythirteen/functions.php
	twentythirteen/header.php
	twentythirteen/image.php
	twentythirteen/inc/back-compat.php
	twentythirteen/inc/custom-header.php
	twentythirteen/index.php
	twentythirteen/js/functions.js
	twentythirteen/js/html5.js
	twentythirteen/languages/twentythirteen.pot
	twentythirteen/page.php
	twentythirteen/screenshot.png
	twentythirteen/search.php
	twentythirteen/sidebar-main.php
	twentythirteen/sidebar.php
	twentythirteen/single.php
	twentythirteen/style.css
	twentythirteen/tag.php
	twentythirteen/taxonomy-post_format.php
	twentytwelve/404.php
	twentytwelve/archive.php
	twentytwelve/author.php
	twentytwelve/category.php
	twentytwelve/comments.php
	twentytwelve/content-aside.php
	twentytwelve/content-image.php
	twentytwelve/content-none.php
	twentytwelve/content-page.php
	twentytwelve/content-status.php
	twentytwelve/content.php
	twentytwelve/css/ie.css
	twentytwelve/editor-style.css
	twentytwelve/footer.php
	twentytwelve/functions.php
	twentytwelve/header.php
	twentytwelve/image.php
	twentytwelve/inc/custom-header.php
	twentytwelve/index.php
	twentytwelve/js/html5.js
	twentytwelve/js/navigation.js
	twentytwelve/js/theme-customizer.js
	twentytwelve/languages/twentytwelve.pot
	twentytwelve/page.php
	twentytwelve/rtl.css
	twentytwelve/screenshot.png
	twentytwelve/search.php
	twentytwelve/sidebar-front.php
	twentytwelve/sidebar.php
	twentytwelve/single.php
	twentytwelve/style.css
	twentytwelve/tag.php
	zeedynamic/category.php
	zeedynamic/changelog.txt
	zeedynamic/footer.php
	zeedynamic/functions.php
	zeedynamic/header.php
	zeedynamic/includes/template-tags.php
	zeedynamic/index.php
	zeedynamic/languages/de_DE.mo
	zeedynamic/languages/de_DE.po
	zeedynamic/loop-frontpage.php
	zeedynamic/loop-single.php
	zeedynamic/loop.php
	zeedynamic/page.php
	zeedynamic/search.php
	zeedynamic/style.css
	zeedynamic/template-fullwidth.php
Local