Merge branch 'maint' master
authorAchim Gratz <Stromeko@Stromeko.DE>
Wed, 22 Oct 2014 19:10:18 +0000 (21:10 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Wed, 22 Oct 2014 19:10:18 +0000 (21:10 +0200)
1  2 
lisp/org.el

diff --cc lisp/org.el
index e253974,7f4be6b..634f2f5
mode 100755,100644..100755