Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Merge pull request #1 from slamke/master

testPull20140705
Merge remote-tracking branch 'origin/master'
Rejected commit: Default
Rejected commit: Default
Merge pull request #1 from androidYibo/master

testPull20140705-2