Merge branch 'master' of github.com:wet-boew/wet-boew into feature-mu… · wet-boew/wet-boew@64ba78a · GitHub

Commit

Merge branch 'master' of github.com:wet-boew/wet-boew into feature-mu…

Browse files

…ltimedia-player

Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/i18n/en-min.js
	build/js/i18n/fr-min.js
	build/js/pe-ap-min.js
	src/js/sass/share-ie7.scss
	src/js/sass/slideout.scss

Loading branch information

LaurentGoderre committed Jul 16, 2012

2 parents 54cd9d7 + 94247dc commit 64ba78a