conflit solved
authorp4bl0 <r@uzy.me>
Fri, 5 Sep 2014 08:06:06 +0000 (10:06 +0200)
committerp4bl0 <r@uzy.me>
Fri, 5 Sep 2014 08:06:06 +0000 (10:06 +0200)
commit290c6667b947aca5512a8d5073c98739c60064e7
tree252ba7f4da82455f500ad40707fdd82ac7f50b11
parent03cb018b990f0c9a66d33a9e5067f6db9bde3596
conflit solved
init.el