Merge branch 'master' of orgmode.org:worg
authorGuido Van Hoecke <guivho@gmail.com>
Sat, 18 May 2013 08:23:48 +0000 (10:23 +0200)
committerGuido Van Hoecke <guivho@gmail.com>
Sat, 18 May 2013 08:23:48 +0000 (10:23 +0200)

Trivial merge