projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f6ef99 2f9fe93)
Merge remote branch 'mjgoins/master'
authorJameson Rollins <jrollins@finestructure.net>
Tue, 23 Mar 2010 06:12:33 +0000 (02:12 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Tue, 23 Mar 2010 06:12:33 +0000 (02:12 -0400)
Conflicts:
doc/george/changelog


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