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)
commitdbeab30f940705e3813746ccf7480619d8261d37
tree099a0b3224b666bfc1289462f1a6d01a24763102
parent0f6ef9923f4d70e2a79edd898f6ac46b617480c9
parent2f9fe93b98ed32b662212899db6ba2174c1138d3
Merge remote branch 'mjgoins/master'

Conflicts:
doc/george/changelog