Merge branch 'master' into max-sticky-agenda
commitcf55d4338a5ab80f206002bb5bf8c5b8d9ca52ac
authorMax Mikhanosha <max@openchat.com>
Sun, 4 Mar 2012 17:32:53 +0000 (4 12:32 -0500)
committerMax Mikhanosha <max@openchat.com>
Sun, 4 Mar 2012 17:32:53 +0000 (4 12:32 -0500)
treebdaf8ae959bfdc6bf8340a19f3ca693171b49610
parentf9691415055006d6f5475bd558bd5966655da590
parentdbe69f26aa5930368774d29c979bd7cd3c10e50c
Merge branch 'master' into max-sticky-agenda