projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 606133e 5447172)
Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 17:05:37 +0000 (12:05 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 17:05:37 +0000 (12:05 -0500)

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