[packages/prison: 2/3] Merge branch 'master' of git://git.pld-linux.org/packages/prison

[baggins]

commit 56f73486e7051d8ebb08df2966c5cd8effbbb6c2
Merge: bbe20f6 49eb8a7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 13 17:11:52 2015 +0100

    Merge branch 'master' of git://git.pld-linux.org/packages/prison

---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/prison.git/commitdiff/2e04d006fc8f8e523a77f28694c9b5209c88618a