# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176517189 0
# Node ID 80adc614a9e57d6b20bf4c6f99eb6905d1eb61b0
# Parent  2d9045592ed35b9b840c63f788622cdfd56113f9# Parent  a4644c26cd8574c43dd38cd1808ced7ad35a5fe9
merge of '68afd9ff77d030e589ee7972830cf2a91916240f'
     and '9aef6467b816a8a5e600be2bfb75f15eb10f7d4a'

diff -r 2d9045592ed3 -r 80adc614a9e5 COPYRIGHT
--- a/COPYRIGHT	Sat Apr 14 01:23:12 2007 +0000
+++ b/COPYRIGHT	Sat Apr 14 02:19:49 2007 +0000
@@ -198,6 +198,7 @@
 Syd Logan
 Lokheed
 Norberto Lopes
+Shlomi Loubaton
 Uli Luckas
 Matthew Luckie
 Mike Lundy
diff -r 2d9045592ed3 -r 80adc614a9e5 libpurple/plugins/mono/api/Makefile.am
--- a/libpurple/plugins/mono/api/Makefile.am	Sat Apr 14 01:23:12 2007 +0000
+++ b/libpurple/plugins/mono/api/Makefile.am	Sat Apr 14 02:19:49 2007 +0000
@@ -1,4 +1,4 @@
-monodir=$(libdir)/purple
+monodir=$(libdir)/libpurple
 
 mono_sources = \
 	BlistNode.cs \
diff -r 2d9045592ed3 -r 80adc614a9e5 libpurple/plugins/mono/loader/Makefile.am
--- a/libpurple/plugins/mono/loader/Makefile.am	Sat Apr 14 01:23:12 2007 +0000
+++ b/libpurple/plugins/mono/loader/Makefile.am	Sat Apr 14 02:19:49 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple
+plugindir = $(libdir)/libpurple
 
 plugin_LTLIBRARIES = mono.la