[phpMyAdmin/el6] (4 commits) ...Merge remote branch 'origin/master' into el6

[Robert Scheck]

Summary of changes:

  1abbe32... Fix paths to changelog and license when doc dir is unversio (*)
  8312d6e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  27bc336... - Upgrade to 4.2.6 (#548260, #959946, #989660, #989668, #99 (*)
  9036cae... Merge remote branch 'origin/master' into el6

(*) This commit already existed in another branch; no separate mail sent