Merge branch 'master' of berthold:repos/emacs
authorp4bl0 <r@uzy.me>
Fri, 5 Sep 2014 08:02:24 +0000 (10:02 +0200)
committerp4bl0 <r@uzy.me>
Fri, 5 Sep 2014 08:02:24 +0000 (10:02 +0200)
commit16412f5c14713daba195682ea516b1d7788d568c
tree73575af3af7d26960a1bad0d6efa184f9b6608a8
parente9527bf6e3d73541e27d38e0344fd8078b394332
parentb17ab9854cad517902a8c5b8b855477b91a2afad
Merge branch 'master' of berthold:repos/emacs
init.el