Merge branch 'upstream' into experimental
authorJulien Valroff <julien@kirya.net>
Thu, 9 Dec 2010 20:15:45 +0000 (21:15 +0100)
committerJulien Valroff <julien@kirya.net>
Thu, 9 Dec 2010 20:15:45 +0000 (21:15 +0100)
Conflicts:
CMakeLists.txt
config.h.in
src/account_abstract.vala
src/accounts.vala
src/globals.vala
src/img_cache.vala
src/main.vala
src/main_window.vala
src/status.vala
src/status_box.vala
src/stream_abstract.vala
src/tree_widget.vala
src/twitter_account.vala
src/twitter_stream_home.vala
src/vapi/config.vapi


Trivial merge