Merge remote-tracking branch 'glassrose/debug-window-send-to-pastebin-button-658724'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 13:11:57 +0000 (14:11 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 13:11:57 +0000 (14:11 +0100)

Trivial merge