# HG changeset patch
# User Gustavo Andres Morero <gustavo@netlandish.com>
# Date 1380054408 10800
#      Tue Sep 24 17:26:48 2013 -0300
# Node ID aee4adb5a88f1426b672e3cfb5e39e4770b8ea5f
# Parent  28a1e1b4374419747564f6ced7bf5fdb33a01146
# Parent  cb6fef3be15b864e05da7e04e77794386669be1d
Automated merge with ssh://bitbucket.org/netlandish/py-kunaki