adium 5339:63097a96adad: And now we merge.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/63097a96adad
revision:	5339:63097a96adad
branch:		(none)
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Feb 19 20:57:27 2013 +0100

And now we merge.

diffs (13 lines):

diff -r 5268b37fad0d -r 63097a96adad test.txt
--- a/test.txt	Tue Feb 19 20:51:03 2013 +0100
+++ b/test.txt	Tue Feb 19 20:57:27 2013 +0100
@@ -74,8 +74,4 @@
 Testing Cappuccino's announcement of hg.
 Testing irker. Again. And again. Again? Now work plz?
 
-Testing github. I broke something, testing hg push again.
-
-Stupid python... And now making sure the trac-hooks actually work. Upgraded about everything that uses python on eider, lets see if the hook works... One more, to see if the warnings are gone.
-
-New test!
+Testing editing inline on github. Mmmmm.