Merge remote-tracking branch 'core/master' into files_encryption

remotes/origin/stable6
Florin Peter 2013-04-26 17:39:13 +07:00
commit 0ce54f092a

Diff Content Not Available