[SCM] libzen/master: Merge branch 'dfsg'

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.4.29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3fdc26fa1892af8763bb7ef145cda5a54bbb1a55
X-Git-Newrev: a29afe06105ac149e0ff18c3a3155a630675d065

The following commit has been merged in the master branch:
commit 1c7f9cf9dadeaaeed2abfafd7be5d0d1d6726a20
Merge: 3fdc26fa1892af8763bb7ef145cda5a54bbb1a55 882b3c63cfc4326a6d4eb05235ff174c7c9bc503
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed May 15 21:28:06 2013 +0800

    Merge branch 'dfsg'


-- 
libzen packaging