sync with apache - #7

Closed

chicm wants to merge 3 commits into

apache:masterfrom

chicm:master

Commits on Nov 6, 2014

Merge pull request #1 from apache/master
chicm
committed
803265d

Commits on Nov 24, 2014

Revert "update"
chicm
committed
b55d958
Merge pull request #2 from chicm/revert-1-master
chicm
committed
e091048