rebuild from various pull requests

This commit is contained in:
Michael DeHaan 2012-09-11 22:29:42 -04:00
commit 4a2bf7f60a
3 changed files with 64 additions and 54 deletions

File diff suppressed because one or more lines are too long