projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fb913f 47456af)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Mon, 2 Mar 2009 20:35:59 +0000 (15:35 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Mon, 2 Mar 2009 20:35:59 +0000 (15:35 -0500)

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