From 2358a220baad2f8dc027d9bd3cd01c34ae234968 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 15 Aug 2012 20:01:55 -0700
Subject: merge from upstream

---
 version.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'version.inc')

diff --git a/version.inc b/version.inc
index ecc830b90..0392ed2d1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-08-13.45
+2012-08-15.47
-- 
cgit v1.2.3