merge from upstream

This commit is contained in:
yetist
2012-10-30 23:19:20 +08:00
18 changed files with 392 additions and 174 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 141 KiB