projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21516ec 3cea2ab)
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
authorMatt Goins <mjgoins@openflows.com>
Sun, 22 Jun 2008 23:41:33 +0000 (19:41 -0400)
committerMatt Goins <mjgoins@openflows.com>
Sun, 22 Jun 2008 23:41:33 +0000 (19:41 -0400)

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