[quake3/f14: 2/2] Merge remote-tracking branch 'origin/master' into f14

[Hans de Goede]

commit 914ab53575ef3145b420cf0b2068c05b5b34ef8e
Merge: 3fb4684 bd00837
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Jul 28 16:12:08 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14

 quake3.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---