merge back ChangeLog in one file

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
fix order

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libgpaste-settings: don't hard-depend on gnome-shell

This avoids the hard dependency for gpasted

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Merge branch 'gpaste-3.10'

* gpaste-3.10:
  libgpaste-settings: don't hard-depend on gnome-shell
  fix order