Merge commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 22 Apr 2009 09:15:41 +0000 (17:15 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 22 Apr 2009 09:15:41 +0000 (17:15 +0800)
commit9e0e4996fad6563f0a1ce628b80db5c23ef8279e
treee1c1e657e73c7c6d3688d64e67aa837537ca0fde
parent108adeac11d175e5434041f7cb56800b5d4241d1
parentdc44e4b118592d1719d9b9ae23ce64a2861fb198
Merge commit 'origin/stable'

Conflicts:

src/ui/gui/output-viewer.c