Merge pull request #1 from ERNICommunity/master#3

Merged

dniklaus merged 1 commit intoERNICommunity:masterfrom

dniklaus:master

Nov 28, 2015

Commits on Feb 20, 2015

Merge pull request #1 from ERNICommunity/didi-1st-trial
dniklaus
committed