Merge remote branch 'spaetz/fix_description'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 9 May 2011 01:20:19 +0000 (20:20 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 9 May 2011 01:20:19 +0000 (20:20 -0500)
commit9d97145fe40cc2a7bce298cad618374375ad4d8b
treeac1b1ff3f12dc4d47f45b720bc3f140a8d7a4e93
parentcd847fd346e048a4bd6c42e065475b3167991213
parentec61f094926c7d64bd76f7d4dc79ce859d6f60ef
Merge remote branch 'spaetz/fix_description'