From: root <root@cassidy.cs.princeton.edu>
Date: Tue, 8 Mar 2011 13:35:48 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: sface-0.1-5~1
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=5d9d4374df91f919e5c744906186b2769b6d09ae;hp=5d9d4374df91f919e5c744906186b2769b6d09ae

Merge commit 'origin/master'
---