manual merge of #304

This commit is contained in:
Tony Tam
2013-09-05 10:16:10 -07:00
parent 046e534d03
commit 8a9eedfdf3
4 changed files with 91 additions and 31 deletions

File diff suppressed because one or more lines are too long