Merge branch 'master' of orgmode.org:org-mode
commitaa7b1e0b397859438f64889510a39293f10bcdf0
authorBastien Guerry <bzg@altern.org>
Tue, 26 Mar 2013 15:00:56 +0000 (26 16:00 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Mar 2013 15:00:56 +0000 (26 16:00 +0100)
tree99b5c644e24ec229c3810f62ec02e443894eba52
parent4184699910809b534fa7a58ac79cda3ac6237383
parent9594249b4d5ceacfe96dc97c40f697de48cf50d3
Merge branch 'master' of orgmode.org:org-mode