Merge branch 'master' of 192.162.71.223:/home/mpeter/.emacs.d

Commit
7b39dbea19cb7eeaf98d3bb9172b98fa9611c78e
Author
Blendoit <blendoit@gmail.com>
Author date
Committer
Blendoit <blendoit@gmail.com>
Committer date
smart-documents.org
index 11db90b0..1a661c40 100644..100644
@@ -330,7 +330,7 @@
330 330 #+END_SRC
331 331
332 332 *** Open the diary
333 Removed:
333 Added: # SSH headache with lws VPS
334 334 #+BEGIN_SRC emacs-lisp :tangle yes
335 335 (global-set-key [f9]
336 336 '(lambda ()