projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1a5568 e0b50e3)
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
authorMatt Goins <mjgoins@openflows.com>
Wed, 25 Jun 2008 05:59:19 +0000 (01:59 -0400)
committerMatt Goins <mjgoins@openflows.com>
Wed, 25 Jun 2008 05:59:19 +0000 (01:59 -0400)

Trivial merge
Bernie's friendly fork of http://web.monkeysphere.info/