init perso
add geiser
geiser mods
Merge branch 'master' of git://github.com/bbatsov/prelude
Merge branch 'master' of github.com:trmwzm/prelude
Merge branch 'master' of git://github.com/bbatsov/prelude
added octopress/org ... not a great idea ?
Merge branch 'master' of github.com:bbatsov/prelude
quoting meta-f5
Merge branch 'master' of git://github.com/bbatsov/prelude
Merge branch 'master' of github.com:trmwzm/prelude
Merge branch 'master' of git://github.com/bbatsov/prelude
merging
merging
submodule borked
init
quoting
updated from yorick repo
weird conflict