From d1379f8e5c77567888f87fa86bd13b3099e42065 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 7 Sep 2010 21:58:05 -0700
Subject: [PATCH] switching back to master

-- 
GitLab