Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 29 Dec 2012 15:50:41 +0000 (16:50 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 29 Dec 2012 15:50:41 +0000 (16:50 +0100)
commitf08ff4eb3229bffe0a3303b8ac44b5fcc3110cc8
treed2cb7f7d5186ef2866e5433758d66e3a55351313
parent9b4b85f66103035c31fa0e5765fc3f87cb508fab
parentd1c55a6a31f59c49c7d9de6b11056ea2dedc35af
Merge branch 'master' of orgmode.org:worg