# HG changeset patch
# User Cristi Magherusan <majeru@atheme-project.org>
# Date 1187224149 -10800
# Node ID aad7eb04f0b516e6dc8267717349f3aeef2c02bd
# Parent  63144ea14b50e7ac30bef29b20326d54853f5681# Parent  f9310819285c6f8e595c8a3f7f23cf4d05ddc876
merge

diff -r 63144ea14b50 -r aad7eb04f0b5 src/mtp_up/mtp.c