projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfdaec4 abc7b09)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Thu, 30 Apr 2009 22:45:59 +0000 (15:45 -0700)
committerJameson Graef Rollins <jrollins@finestructure.net>
Thu, 30 Apr 2009 22:45:59 +0000 (15:45 -0700)

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