[shutter/f13/master] upgrade to shutter-0.86.4

[Liang Suilong]

commit 1cc6f3a7473fe14f6c3e74862e1a3bef353504b3
Author: Fedora <liangsuilong at gmail.com>
Date:   Mon Sep 13 20:06:20 2010 +0800

    upgrade to shutter-0.86.4

 sources |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index 6078b9a..aa1369c 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
 874a4b5a113d81f4c83bc67b5a4a029a  shutter-0.86.4.tar.gz
-<<<<<<< HEAD
->>>>>>> master
-=======
-
->>>>>>> f12/master