Merge branch 'master' into max-sticky-agenda
commitf9691415055006d6f5475bd558bd5966655da590
authorMax Mikhanosha <max@openchat.com>
Sat, 3 Mar 2012 23:31:32 +0000 (3 18:31 -0500)
committerMax Mikhanosha <max@openchat.com>
Sat, 3 Mar 2012 23:31:32 +0000 (3 18:31 -0500)
tree345684ed10d7afe7ac11917f1484ea8d852e72a1
parented0859969bc8bb0732d229e10767b96afa08f0cc
parent6fd14fe6832184dc6976ea91a5ca01551d53fb8c
Merge branch 'master' into max-sticky-agenda