projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b6ebcd 6ed72ef)
Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Wed, 29 Oct 2008 16:20:42 +0000 (12:20 -0400)
committerMatt Goins <mjgoins@openflows.com>
Wed, 29 Oct 2008 16:20:42 +0000 (12:20 -0400)

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