Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
This commit is contained in:
Shuge Lee 2013-01-16 13:53:10 +08:00
commit 8db7169a32

Diff Content Not Available