# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1339607474 -7200
# Node ID 3c52a573889a8fdc40c260e4e5ea653c65e2af55
# Parent  a7251453b7ff87ec82baa73c56038b1dc14b4e0a# Parent  5fa39b653154528f3df9ec6263b3de98c671ac2a
Merge branch 'stable'

diff -r a7251453b7ff -r 3c52a573889a src/libpaper.mk