remove useless info
Merge branch 'joda-time' into dev