From: Drew Fisher <drew.m.fisher@gmail.com>
Date: Mon, 7 Sep 2009 01:40:45 +0000 (-0500)
Subject: Merge branch 'master' of rabbit:/home/zarvox/wp3
X-Git-Url: http://git.zarvox.org/%7B%7B%20url_for%28%27main.login_page%27%29%20%7D%7D?a=commitdiff_plain;h=f70ae8fc37ba4b44f7a2692ba94c40572761bc23;p=wp3.git

Merge branch 'master' of rabbit:/home/zarvox/wp3
---

f70ae8fc37ba4b44f7a2692ba94c40572761bc23