Merge branch 'master' of orgmode.org:org-mode
commitc35168ed3ffd3272c06e2c17f865fb159d62726c
authorChristian Egli <christian.egli@sbs.ch>
Fri, 12 Apr 2013 20:25:42 +0000 (12 22:25 +0200)
committerChristian Egli <christian.egli@sbs.ch>
Fri, 12 Apr 2013 20:25:42 +0000 (12 22:25 +0200)
treecb1ed2e68b25d3b17e96a148da610f757e722c1f
parentbbf70e74fb957607ba85301d7d54f4e40edcfe68
parent87e84ca48fe945647ada7fc9f933757bba31e922
Merge branch 'master' of orgmode.org:org-mode