Merge branch 'maint'
commite8e8f6738a8284c63c648928419a6d1d69b3e348
authorAchim Gratz <Stromeko@Stromeko.DE>
Sat, 3 May 2014 08:15:42 +0000 (3 10:15 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sat, 3 May 2014 08:15:42 +0000 (3 10:15 +0200)
tree4bb3cd4ca49fff41a7996dd2d4ab7aebe07b2ff7
parent9efbfb34cb29ca3168f2677ef6d41cfdd4477f3e
parent063c8b03b733371ebae473225e0526c905264b4e
Merge branch 'maint'
lisp/ob-tangle.el
lisp/org-agenda.el