Bug 919944 - Bump versions for 2.1 development. r=dhunt
Bug 748704 - Make use of the Services module in Mozmill. r=hskupin
Merge remote-tracking branch 'upstream/master'