Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index dc7d4ba,0fb5ed5..43bd65e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,8 +1,15 @@@
++2013-04-16  David Edmondson  <dme@dme.org>
++
++      Support <img src="data:...">.
++
++      * shr.el (shr-image-from-data): New function.
++      (shr-tag-img): Use it.
++
+ 2013-04-14  Andrew Cohen  <cohen@bu.edu>
+ 
+       * nnir.el (nnir-request-set-mark): Make sure we are in the right
+       group.
+ 
  2013-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * gnus-msg.el (gnus-msg-mail): Make it avoid using posting styles