Merge branch 'upstream' for new release 2.1
authorJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:25:23 +0000 (18:25 +0100)
committerJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:25:23 +0000 (18:25 +0100)
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules

1  2 
debian/changelog

index 729e758,0000000..35074a0
mode 100644,000000..100644
--- /dev/null
@@@ -1,5 -1,0 +1,16 @@@
++pino (0.2.1-1) unstable; urgency=low
++
++  * New upstream release:
++    - Experimental support for status.net sites and API proxies
++    - Viewing user information
++    - Follow/unfollow
++    - Improvements in the conversation dialog
++    - Few bugs fixed
++
++ -- Julien Valroff <julien@kirya.net>  Tue, 09 Mar 2010 18:24:34 +0100
++
 +pino (0.2.0-1) unstable; urgency=low
 +
 +  * Initial release
 +
 + -- Julien Valroff <julien@kirya.net>  Sat, 06 Mar 2010 11:19:46 +0100