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)
commita2a00cc32cfb5a0a3557e0a5150dfedf37f5f932
tree65d7b7443bd2ef8b6fce0770a8a2fc56c93cb898
parentc3801d5902bebf116bfc86772ae2e46cd75bb9a1
parent29479242d1c355ec27e23f353408f84ac27e1fcc
Merge branch 'upstream' into experimental

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