[shotwell] Merge from shotwell-0.15 for 0.15.1

[Jim Nelson <jnelson src gnome org>]

commit 4396ed3fb73ec756b8a56751503002bcff91ab54
Author: Jim Nelson <jim yorba org>
Date:   Tue Nov 19 17:26:12 2013 -0800

    Merge from shotwell-0.15 for 0.15.1

 Makefile         |    2 +-
 NEWS             |    7 +++++++
 debian/changelog |    8 ++++++++
 3 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index 3038d93..8fbb6fd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PROGRAM = shotwell
 PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
 PROGRAM_MIGRATOR = shotwell-settings-migrator
 
-VERSION = 0.15.0+trunk
+VERSION = 0.15.1+trunk
 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
 GETTEXT_PACKAGE = $(PROGRAM)
 BUILD_ROOT = 1
diff --git a/NEWS b/NEWS
index 03f4c2d..da63c65 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Shotwell 0.15.1 - 19 November 2013 - "You're a Cashier!"
+--------------------------------------------------------
+
+  * Install Tumblr plugin resources
+  * Fix crash when video thumbnails are being inspected and created
+
+
 Shotwell 0.15.0 - 3 October 2013 - "Fruit's a Gamble"
 -----------------------------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 74798e9..278689b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shotwell (0.15.1-1~raring1) raring; urgency=low
+
+  * Install Tumblr plugin resources
+  * Fix crash when video thumbnails are being inspected and created
+
+ -- Jim Nelson <jim yorba org>  Tue, 19 Nov 2013 16:28:43 -0800
+
+
 shotwell (0.15.0-2~raring1) raring; urgency=low
 
   * Update to latest gexiv2