style/ali0une/user.css
Merge remote-tracking branch 'upstream/master'
style/ali0une/screenshots
Merge remote-tracking branch 'upstream/master'

sync with master 20120320
typo style/ali0une/user.css
Merge remote-tracking branch 'upstream/master'

sync with tontof master 20120320
Merge remote-tracking branch 'upstream/master'

merge upstream/master 20130320
style/ali0une/user.css issue #91
Merge remote-tracking branch 'upstream/master'

sync from master 20130321
synced from tontof 20130321
Merge remote-tracking branch 'upstream/master'

merge from tontof 20130321
synced with tontof 20130321
Merge remote-tracking branch 'upstream/master'

merge upstream/master
Merge branch 'master' of https://github.com/ali0une/kriss_feed

pull origin master
rm
Merge branch 'master' of https://github.com/tontof/kriss_feed

Conflicts:
	src/class/Feed.php
	src/index.php
sync with upstream
Merge remote-tracking branch 'upstream/master'

merge upstream/master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'