adium/adium

And now we merge.

2013-02-19, Thijs Alkemade
63097a96adad
Parents 5268b37fad0d2808f202d2ef
Children 1f92dea9382b
And now we merge.
1 files changed, 1 insertions(+), 5 deletions(-)
  • +1 -5
    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.