Merge branch 'master' of orgmode.org:org-mode
commit59d2f28024c358c88060e6c8d8ac1e7db76b6738
authorBastien Guerry <bzg@altern.org>
Sat, 6 Sep 2014 22:44:33 +0000 (7 00:44 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Sep 2014 22:44:33 +0000 (7 00:44 +0200)
treeac099db1176ea750b43a2e208d57d576a4b493fb
parent41eae9bd42ac815664f9fad9f9a3792a337489ab
parent1a7c9d7d79f9f9071c36808a825f8bb2770c9ab2
Merge branch 'master' of orgmode.org:org-mode