projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5aa38d b62cb24)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Mar 2009 00:48:14 +0000 (19:48 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Mar 2009 00:48:14 +0000 (19:48 -0500)

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