[SCM] ois/master: Merge branch 'user-rzr'

[alessio at users.alioth.debian.org]

update for release 1.3.0-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cf6167f7c7633c5b665c9ac1823f1c084905bad0
X-Git-Newrev: 79b7fd7e4d4d64f0b21346b5bf5efbb608fda42a

The following commit has been merged in the master branch:
commit 79b7fd7e4d4d64f0b21346b5bf5efbb608fda42a
Merge: cf6167f7c7633c5b665c9ac1823f1c084905bad0 a3145e36bb3a842f7f2dc854a9ef4a8fe8bde4ee
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 13 08:19:10 2011 +0200

    Merge branch 'user-rzr'


-- 
ois packaging