Merge branches 'upstream' and 'master'
fix typo
reword information around statistics collector. based on bug report SF #3602305
fix typo
reword information around statistics collector. based on bug report SF #3602305
Merge branch 'master' of github.com:xzilla/phppgadmin