grim/guifications2

grim/guifications2/
merged the changelog changes back in

2010-11-28, Gary Kramlich
be7c661f1141