* src/gramps.glade: Remove hot keys from toolbar buttons.

Add editing items under Edit menu.
* src/gramps_main.py: Enable/disable new menu items.
* NEWS, configure, configure.in, gramps.spec, doc/gramps.1,
doc/gramps-manual/C/gramps-manual-C.omf,
doc/gramps-manual/C/gramps-manual.xml: merge with 0.9.5 branch.

* Version 0.9.5:  the "Fix me up" release.

* src/gramps_main.py (delete_person_response, merge_update):
Add remove_from_history and redraw_histmenu() calls before deleting
the person.
* doc/gramps.1.in, doc/gramps.1, doc/gramps-manual/C/gramps-manual.xml,
doc/gramps-manual/C/gramps-manual.omf, gramps.spec: New version.
* configure.in: Fix version and release numbers for 0.9.5-1.
* NEWS: Update for a 0.9.5 release.


svn: r2222

gramps2/NEWS

@@ -1,3 +1,6 @@
+Version 0.9.5 -- the "Fix me up" release
+* Fixed problem with deleting/merging people. 
+
 Version 0.9.4 -- the "This used to bug me..." release
 * More compliance with GNOME HIG.
 * Fixed style problems for book items.