From: Uri Guttman <uri@quad.(none)>
Date: Wed, 9 Sep 2009 22:01:06 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ff2960287d17b5ff05f4d4d19c3f5891e3faa91a;hp=-c;p=urisagit%2FStem.git

Merge commit 'origin/master'
---

ff2960287d17b5ff05f4d4d19c3f5891e3faa91a