Rejected commit: Default
Rejected commit: Default
Merge branch 'master' of https://github.com/androidYibo/SMSStation
Merge remote-tracking branch 'origin/master'

Conflicts:
	SMSStattion/src/com/unityprima/smsstattion/MainActivity.java
Rejected commit: Default
Merge branch 'master' of https://github.com/androidYibo/SMSStation
Merge pull request #6 from slamke/master

Merge pull request #5 from androidYibo/master
Merge branch 'master' of https://github.com/androidYibo/SMSStation
Rejected commit: Default
Rejected commit: Default
Merge pull request #6 from androidYibo/master

20140711 push to slamke -1