From: Dan Winship <danw@gnome.org>
Date: Fri, 22 Feb 2008 17:53:07 +0000 (-0500)
Subject: Merge branch 'master' of git+ssh://people.freedesktop.org/~danw/razor
X-Git-Tag: 0.1~229
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=cb2ae5f0ea2ff24b344883d8edb3c5699c365e4c;p=razor.git

Merge branch 'master' of git+ssh://people.freedesktop.org/~danw/razor

Conflicts:

	razor.c
---

cb2ae5f0ea2ff24b344883d8edb3c5699c365e4c