Merge commit 'deejay1/master'
authorGabriel Burt <gabriel.burt@gmail.com>
Sat, 8 Aug 2009 18:17:04 +0000 (11:17 -0700)
committerGabriel Burt <gabriel.burt@gmail.com>
Sat, 8 Aug 2009 18:17:04 +0000 (11:17 -0700)
commit3e2c9f47c570d6811012dcd1e580ae390b488045
treea65bbe61b1572618fb72f653aef966faa97150e9
parent4b026ff3f6f942ded99fd7f9a58fe8683f0f215c
parent65eed13b3bddce54c52d0943a3b0da7ffb3754de
Merge commit 'deejay1/master'

Conflicts:
src/PdfMod/PdfMod/GlobalActions.cs
configure.ac