Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (19:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (19:27 +0100)
1  2 
lisp/org-mobile.el
lisp/org.el

Simple merge
diff --cc lisp/org.el
Simple merge