[SCM] ois/master: Merge commit 'upstream/1.3.0+dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.3.0+dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7c18fd192c82f20165229c4c572bcc5818af5306
X-Git-Newrev: 7be4b304cb35419f0f2b599ce3dbacfa76044fd2

The following commit has been merged in the master branch:
commit 7be4b304cb35419f0f2b599ce3dbacfa76044fd2
Merge: 7c18fd192c82f20165229c4c572bcc5818af5306 f931ea08e47edda2758d3a7718f381b305927bfb
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 13 13:01:44 2011 +0200

    Merge commit 'upstream/1.3.0+dfsg0'


-- 
ois packaging