merge master + move changelog and news to readme

diff --cc README.xwidget
index cfde411082b9d94c57b91dfa7cd591d07f8a033d,0000000000000000000000000000000000000000..b8ba6b872b30cfd5df1ce0c9c433da8e9b019523
mode 100644,000000..100644
--- 1/README.xwidget
--- /dev/null
+++ b/README.xwidget
@@@ -1,2 -1,0 +1,14 @@@
 +-*-org-*-
 +Please see https://github.com/jave/xwidget-aux for documentation.
++
++* NEWS
++** Xwidgets : A new feature for embedding native widgets
++inside Emacs buffers. If you have gtk3 and webkit-devel installed,
++you can try the embedded webkit browser with m-x xwidget-webkit-browse-url.
++
++
++* lisp/Changelog
++
++2015-02-01  Joakim Verona  <joakim@verona.se>
++      Support for the new Xwidget feature.
++      * xwidget.el:

diff --cc src/ChangeLog
Simple merge

diff --cc test/ChangeLog
index 28178812a95553291c3070833c0436c71720f6dc,56e3ac08e54ce2ccaeab1895bb0c334eed9ef764..60b3ed352d07c75bdc9ee810528dbac96abe014f
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,11 -1,7 +1,12 @@@
- 2015-02-01  Grégoire Jadi  <daimrod@gmail.com>
-       Support for testing xwidgets
-       * automated/xwidget-tests.el:
 +2015-02-01 Joakim Verona  <joakim@verona.se>
 +      Support for testing xwidgets
 +      * xwidget-test-manual.el:
 +
+ 2015-02-03  Artur Malabarba  <bruce.connor.am@gmail.com>
+ 
+       * automated/package-test.el (package-test-get-deps): New test.
+ 
 +
  2015-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * automated/eieio-tests.el (eieio-test-23-inheritance-check): Simplify.