[SCM] Packaging for OpenArena data branch, openarena-085-data, updated. 3bf5b76e225949f8e7e0fa107710b619b66ddf4e

[Simon McVittie]

The following commit has been merged in the openarena-085-data branch:
commit 4060effd8605c9e4893f2b6a6b83e3b8bf26edb4
Merge: 8adc9b1dc96c661caad952b218c9b9cc5eeb714c bea1d1e2ef60b8e933ba81bcfbd472adc3831ddb
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 15 13:37:43 2011 +0100

    Merge branch 'master' into openarena-085-data
    
    Conflicts:
    	debian/changelog


-- 
Packaging for OpenArena data