[wellwell-devel] [wellwell: 73/73] Merge branch 'zoom'

[Stefan Hornburg]

commit f8872b2458adda7064d19572298bc63acd9da89e
Merge: a4d3040... 3fea6d7...
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Sun Mar 13 20:40:56 2011 +0100

    Merge branch 'zoom'
    
    Conflicts:
    	database/mysql/plugins.sql
    	database/pgsql/plugins.sql
    	lib/WellWell/Core.pm
    	lib/WellWell/Data.pm
    	lib/WellWell/Plugin.pm

 database/mysql/plugins.sql            |    1 +
 database/pgsql/plugins.sql            |    1 +
 lib/Vend/PDF.pm                       |  157 +++++++++++++++
 lib/WellWell/Compose.pm               |   62 +++++-
 lib/WellWell/Compose/Component/ITL.pm |   41 ++++
 lib/WellWell/Compose/Engine/ITL.pm    |   59 ++++++
 lib/WellWell/Core.pm                  |   35 +++-
 lib/WellWell/Data.pm                  |   24 ++-
 lib/WellWell/Engine.pm                |   60 ++++++
 lib/WellWell/Filter/Link.pm           |   34 ++++
 lib/WellWell/Flute.pm                 |  349 +++++++++++++++++++++++++++++++++
 lib/WellWell/Flute/Increment.pm       |   67 +++++++
 lib/WellWell/Iterate.pm               |  114 +++++++++++
 lib/WellWell/Plugin.pm                |   37 +++--
 plugins/wishlists/code/wishlist.tag   |   11 +
 15 files changed, 1018 insertions(+), 34 deletions(-)
---
diff --cc lib/WellWell/Data.pm
index 7048981,7f00c1e..153bfcb
--- a/lib/WellWell/Data.pm
+++ b/lib/WellWell/Data.pm
@@@ -22,8 -22,9 +22,10 @@@ package WellWell::Data
  use strict;
  use warnings;
  
+ use Rose::DB::Object::Loader;
+ 
  use Vend::Data;
 +use DBIx::Easy;
  
  sub prepare_database {
  	my ($userdb_ref, $users_table, %dbif);