Merge branch 'master' of git+ssh://people.freedesktop.org/~danw/razor
authorDan Winship <danw@gnome.org>
Fri, 22 Feb 2008 17:53:07 +0000 (12:53 -0500)
committerDan Winship <danw@gnome.org>
Fri, 22 Feb 2008 17:53:07 +0000 (12:53 -0500)
commitcb2ae5f0ea2ff24b344883d8edb3c5699c365e4c
tree18c43afc9720ae5bbb530c9d8b3b0c8dda173e47
parent7b5b52b08af84cb78e00e91ca66ac64b193c9bea
parenta1ec9f1754d3a47ec986c7817bcd206e07993be7
Merge branch 'master' of git+ssh://people.freedesktop.org/~danw/razor

Conflicts:

razor.c
razor.c