[poppler] 2 commits - qt4/src

[Jeff Muizelaar]

On Sat, Feb 09, 2008 at 08:58:59AM -0800, Pino Toscano wrote:
>  qt4/src/poppler-qiodeviceoutstream.cc |   11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> New commits:
> commit afb255366d56551bdc307766199bef9c5021d3ac
> Merge: 8c44b17... 8cb0e75...
> Author: Pino Toscano <pino at kde.org>
> Date:   Sat Feb 9 17:58:49 2008 +0100
> 
>     Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
>

If you use 'git pull --rebase' with git 1.5.4 you can often avoid adding
these mostly useless merge messages to the history.

-Jeff