[glusterfs/kk-el6] (4 commits) ...Merge remote-tracking branch 'origin' into kk-el6

[Kaleb S. KEITHLEY]

Summary of changes:

  0cd8f5a... sync with upstream glusterfs.spec.in BZ #1091392 (*)
  373c16e... sync with upstream glusterfs.spec.in BZ #1091392 (*)
  f7d186d... syslog deprecated in Fedora20 BZ #1093318 (*)
  9399b8f... Merge remote-tracking branch 'origin' into kk-el6

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