# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1177362315 0
# Node ID 9b0a3110f86ee7b7eb7fd6f5d88edeac2b05dfdf
# Parent  08557e94840cf66bcf7615a01bf835b386f93cf6# Parent  c14a05c00484832478c6d748270ae4c09f9b355c
merge of '55f22d2ce30ce89352ce4b9c71f8f02875603aa2'
     and '67e3740f9fcacdf7f78cd7ece27a338301393d62'

diff -r 08557e94840c -r 9b0a3110f86e libpurple/plugins/mono/api/Makefile.am
diff -r 08557e94840c -r 9b0a3110f86e libpurple/plugins/mono/loader/Makefile.am