rpm v3.2.1-2.fc20 built
Merge remote-tracking branch 'upstream/master'
rpm v3.3.1-1.fc20 built
Merge pull request #20 from wangjiezhe/master

rpm v3.3.1-1.fc20 built