From: Marius Olbertz <marius.olbertz@gmail.com>
Date: Fri, 25 Dec 2015 13:26:59 +0000 (+0100)
Subject: Merge branch 'develop' of https://github.com/zurb/foundation-sites into rtl-slider
X-Git-Tag: v6.1.2~115^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baef48905d776941cf101dd8ebe45314e8676a6b;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' of https://github.com/zurb/foundation-sites into rtl-slider

Conflicts:
	js/foundation.slider.js
---

baef48905d776941cf101dd8ebe45314e8676a6b