Public Git Hosting - mygpo.git/commit

commit	ef948ed22d3f652de25c3004ca80525297a6a365
author	Stefan Kögl <stefan@skoegl.net>
	Wed, 22 Oct 2014 18:18:15 +0000 (22 20:18 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Wed, 22 Oct 2014 18:18:15 +0000 (22 20:18 +0200)
tree	3df5de4c45d535b056b9db964eb657a5ea308539	tree \| snapshot (tar.gz zip)
parent	4cf817e9e7729753f60befb3b77dede4716cacbf	commit \| diff
parent	b08147266d487e57f939ebfc3a318ff5a4432ac7	commit \| diff

Merge branch 'static-media' into design

Conflicts:
static/css/bootstrap-responsive.css
static/css/bootstrap-responsive.min.css
static/css/bootstrap-theme.css
static/css/bootstrap-theme.min.css
static/css/bootstrap.css
static/css/bootstrap.min.css
static/css/font-awesome-ie7.css
static/css/font-awesome-ie7.min.css
static/css/font-awesome.css
static/css/font-awesome.min.css
static/font/fontawesome-webfont.eot
static/font/fontawesome-webfont.svg
static/font/fontawesome-webfont.svgz
static/font/fontawesome-webfont.ttf
static/font/fontawesome-webfont.woff
static/js/bootstrap-dropdown.js
static/js/bootstrap.js
static/js/bootstrap.min.js
static/js/jquery.js