merge
Merge branch 'master' of github.com:loadays/pelican-site

Conflicts:
	output/CNAME.gz
	output/Loadays 2013 is a GO!.html.gz
	output/Post number 2.html.gz
	output/archives.html.gz
	output/author/loadays-crew.html.gz
	output/call_for_sponsors.html.gz
	output/categories.html.gz
	output/category/misc.html.gz
	output/feeds/all-en.atom.xml.gz
	output/feeds/all.atom.xml.gz
	output/feeds/all.rss.xml.gz
	output/feeds/misc.atom.xml.gz
	output/feeds/rss.xml.gz
	output/index.html.gz
	output/pages/about.html.gz
	output/pages/faq.html.gz
	output/pages/schedule.html.gz
	output/pages/where.html.gz
	output/sitemap.xml
	output/sitemap.xml.gz
	output/static/archives/2011/contact/index.html.gz
	output/static/archives/2011/content/16-april-1000-1025.html.gz
	output/static/archives/2011/content/16-april-1025-1115.html.gz
	output/static/archives/2011/content/16-april-1115-1215.html.gz
	output/static/archives/2011/content/16-april-1215-1315.html.gz
	output/static/archives/2011/content/16-april-1315-1415.html.gz
	output/static/archives/2011/content/16-april-1415-1515.html.gz
	output/static/archives/2011/content/16-april-1515-1530.html.gz
	output/static/archives/2011/content/16-april-1530-1630.html.gz
	output/static/archives/2011/content/16-april-1630-1745.html.gz
	output/static/archives/2011/content/16-april-1730-1830.html.gz
	output/static/archives/2011/content/17-april-1015-1115.html.gz
	output/static/archives/2011/content/17-april-1115-1215.html.gz
	output/static/archives/2011/content/17-april-1140-1230.html.gz
	output/static/archives/2011/content/17-april-1215-1315.html.gz
	output/static/archives/2011/content/17-april-1315-1415.html.gz
	output/static/archives/2011/content/17-april-1415-1515.html.gz
	output/static/archives/2011/content/17-april-1515-1530.html.gz
	output/static/archives/2011/content/17-april-1530-1630.html.gz
	output/static/archives/2011/content/17-april-1630-1745.html.gz
	output/static/archives/2011/content/17-april-1745-1745.html.gz
	output/static/archives/2011/content/2012-go.html.gz
	output/static/archives/2011/content/alice-bob-public-key-cryptography-101.html.gz
	output/static/archives/2011/content/android-risk.html.gz
	output/static/archives/2011/content/bash-0.html.gz
	output/static/archives/2011/content/bash-tutorial.html.gz
	output/static/archives/2011/content/break-0.html.gz
	output/static/archives/2011/content/break.html.gz
	output/static/archives/2011/content/building-and-maintaining-rpm-packages-0.html.gz
	output/static/archives/2011/content/building-and-maintaining-rpm-packages.html.gz
	output/static/archives/2011/content/building-scalable-web-open-source-technologies.html.gz
	output/static/archives/2011/content/call-presentations.html.gz
	output/static/archives/2011/content/centos-beyond-distribution-engineering.html.gz
	output/static/archives/2011/content/closing.html.gz
	output/static/archives/2011/content/cloudy-deployments.html.gz
	output/static/archives/2011/content/deploying-and-maintaining-your-software-rpmapt.html.gz
	output/static/archives/2011/content/eu-member-states-interoperability-impossible-without-vendor-independent-pcs.html.gz
	output/static/archives/2011/content/exploring-ipv6.html.gz
	output/static/archives/2011/content/faq.html.gz
	output/static/archives/2011/content/fedora-and-virtualization.html.gz
	output/static/archives/2011/content/fedora-security-spin.html.gz
	output/static/archives/2011/content/first-talks-announced.html.gz
	output/static/archives/2011/content/fusioninventory-and-glpi.html.gz
	output/static/archives/2011/content/ldap-linux-admins-lightning-course-0.html.gz
	output/static/archives/2011/content/ldap-linux-admins-lightning-course.html.gz
	output/static/archives/2011/content/leopold-hotel-antwerp.html.gz
	output/static/archives/2011/content/linux-containers.html.gz
	output/static/archives/2011/content/linux-dm-multipath.html.gz
	output/static/archives/2011/content/linux-ha-pacemaker.html.gz
	output/static/archives/2011/content/loadays-2011-thanks.html.gz
	output/static/archives/2011/content/loadays-and-antwerp-marathon.html.gz
	output/static/archives/2011/content/loadays-weekend.html.gz
	output/static/archives/2011/content/lpi-certification-exams-load-2011.html.gz
	output/static/archives/2011/content/lpi-points-facts-and-focus.html.gz
	output/static/archives/2011/content/lunch-0.html.gz
	output/static/archives/2011/content/lunch.html.gz
	output/static/archives/2011/content/mysql-toolkits-maatkit-and-aspersa.html.gz
	output/static/archives/2011/content/new-load.html.gz
	output/static/archives/2011/content/one-stap-know.html.gz
	output/static/archives/2011/content/openchange-free-software-implementation-exchangerpc-protocol.html.gz
	output/static/archives/2011/content/perl.html.gz
	output/static/archives/2011/content/pizza-party.html.gz
	output/static/archives/2011/content/press.html.gz
	output/static/archives/2011/content/provisional-schedule-announced.html.gz
	output/static/archives/2011/content/python.html.gz
	output/static/archives/2011/content/quick-look-dnssec.html.gz
	output/static/archives/2011/content/rebuilding-enterprise-linux-distros-0.html.gz
	output/static/archives/2011/content/ruby.html.gz
	output/static/archives/2011/content/s-virt.html.gz
	output/static/archives/2011/content/secrets-selinux.html.gz
	output/static/archives/2011/content/single-sign-kerberos-and-ldap.html.gz
	output/static/archives/2011/content/unbound-caching-validating-dnssec-resolver.html.gz
	output/static/archives/2011/content/unix-2-linux-migration.html.gz
	output/static/archives/2011/content/varnish.html.gz
	output/static/archives/2011/content/welcome-and-intro.html.gz
	output/static/archives/2011/content/what-format-do-you-prefer-loadays-2012.html.gz
	output/static/archives/2011/content/what-opsi-and-how-helps-managing-microsoft-windows-0.html.gz
	output/static/archives/2011/content/what-opsi-and-how-helps-managing-microsoft-windows.html.gz
	output/static/archives/2011/content/where.html.gz
	output/static/archives/2011/content/will-you-attend-loadays.html.gz
	output/static/archives/2011/content/zarafa-collaboration-platform-0.html.gz
	output/static/archives/2011/content/zarafa-collaboration-platform.html.gz
	output/static/archives/2011/content/zenoss-tutorial-0.html.gz
	output/static/archives/2011/content/zenoss-tutorial.html.gz
	output/static/archives/2011/content/zentyal-linux-small-business-server.html.gz
	output/static/archives/2011/index.html.gz
	output/static/archives/2011/misc/drupal.js?o.gz
	output/static/archives/2011/misc/jquery.js?o.gz
	output/static/archives/2011/misc/textarea.js?o.gz
	output/static/archives/2011/modules/node/node.css?o.css.gz
	output/static/archives/2011/modules/poll/poll.css?o.css.gz
	output/static/archives/2011/modules/system/defaults.css?o.css.gz
	output/static/archives/2011/modules/system/system-menus.css?o.css.gz
	output/static/archives/2011/modules/system/system.css?o.css.gz
	output/static/archives/2011/modules/user/user.css?o.css.gz
	output/static/archives/2011/modules/user/user.js?o.gz
	output/static/archives/2011/news.html.gz
	output/static/archives/2011/news?page=1.html.gz
	output/static/archives/2011/node.html.gz
	output/static/archives/2011/node?page=1.html.gz
	output/static/archives/2011/places-eat.html.gz
	output/static/archives/2011/program/schedule.html.gz
	output/static/archives/2011/rss.xml.gz
	output/static/archives/2011/sites/all/modules/contrib/cck/modules/fieldgroup/fieldgroup.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/cck/theme/content-module.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/ctools/css/ctools.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/date/date.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/date/date_popup/themes/datepicker.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/date/date_popup/themes/jquery.timeentry.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/filefield/filefield.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/mollom/mollom.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/mollom/mollom.js?o.gz
	output/static/archives/2011/sites/all/modules/contrib/ubercart/uc_order/uc_order.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/ubercart/uc_product/uc_product.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/ubercart/uc_store/uc_store.css?o.css.gz
	output/static/archives/2011/sites/all/modules/contrib/views/css/views.css?o.css.gz
	output/static/archives/2011/sites/loadays.org/themes/arthemia/aggregator.css?o.css.gz
	output/static/archives/2011/sites/loadays.org/themes/arthemia/favicon.ico.gz
	output/static/archives/2011/sites/loadays.org/themes/arthemia/ribbon.css?o.css.gz
	output/static/archives/2011/sites/loadays.org/themes/arthemia/style.css?o.css.gz
	output/static/archives/2011/user.1.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F106#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F118#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F119#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F123#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F124#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F125#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F126#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F128#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F129#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F130#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F27#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F35#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F37#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F49#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F50#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F51#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F52#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F53#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F54#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F55#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F56#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F60#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F64#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F68#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F71#comment-form.html.gz
	output/static/archives/2011/user/login?destination=comment%2Freply%2F72#comment-form.html.gz
	output/static/archives/2011/user/password.html.gz
	output/static/archives/2011/user/register.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F106#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F118#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F119#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F123#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F124#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F125#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F126#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F128#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F129#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F130#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F27#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F35#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F37#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F49#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F50#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F51#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F52#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F53#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F54#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F55#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F56#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F60#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F64#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F68#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F71#comment-form.html.gz
	output/static/archives/2011/user/register?destination=comment%2Freply%2F72#comment-form.html.gz
	output/static/archives/2011/users/andrew-findlay.html.gz
	output/static/archives/2011/users/bdesmet.html.gz
	output/static/archives/2011/users/benoit-mortier.html.gz
	output/static/archives/2011/users/bertrand-juglas.html.gz
	output/static/archives/2011/users/dimitri-vanoverbeke.html.gz
	output/static/archives/2011/users/fabrice-flore-thebault.html.gz
	output/static/archives/2011/users/fabrice-mous.html.gz
	output/static/archives/2011/users/frederic-hornain.html.gz
	output/static/archives/2011/users/gijs-hillenius.html.gz
	output/static/archives/2011/users/gratien-dhaese.html.gz
	output/static/archives/2011/users/henrik-heigl.html.gz
	output/static/archives/2011/users/jan-piet-mens.html.gz
	output/static/archives/2011/users/jane-curry.html.gz
	output/static/archives/2011/users/jelmer-vernooij.html.gz
	output/static/archives/2011/users/jorge-salamero-sanz.html.gz
	output/static/archives/2011/users/jos-vos.html.gz
	output/static/archives/2011/users/joshua-thijssen.html.gz
	output/static/archives/2011/users/kbsingh.html.gz
	output/static/archives/2011/users/kenny-gryp.html.gz
	output/static/archives/2011/users/krisbuytaert.html.gz
	output/static/archives/2011/users/maciej-dobrzanski.html.gz
	output/static/archives/2011/users/marcel-nijenhof.html.gz
	output/static/archives/2011/users/milo-oostergo.html.gz
	output/static/archives/2011/users/paul-cobbaut.html.gz
	output/static/archives/2011/users/thijsferyn.html.gz
	output/static/archives/2011/users/tim-speetjens.html.gz
	output/static/archives/2011/users/toshaanbharvani-0.html.gz
	output/static/archives/2011/users/toshaanbharvani.html.gz
	output/static/archives/2011/users/wouter-verhelst.html.gz
	output/static/archives/2011/users/ywein.html.gz
	output/static/archives/2012/content/archives.html.gz
	output/static/archives/2012/content/bookingcom.html.gz
	output/static/archives/2012/content/btr-services.html.gz
	output/static/archives/2012/content/cfp-load12.html.gz
	output/static/archives/2012/content/concerning-puppet-tutorial.html.gz
	output/static/archives/2012/content/don-bosco.html.gz
	output/static/archives/2012/content/faq.html.gz
	output/static/archives/2012/content/inuits.html.gz
	output/static/archives/2012/content/itpartners.html.gz
	output/static/archives/2012/content/load-provisional-schedule.html.gz
	output/static/archives/2012/content/load-schedule.html.gz
	output/static/archives/2012/content/load12-go.html.gz
	output/static/archives/2012/content/load12-schedule-qr-code.html.gz
	output/static/archives/2012/content/lpi-certification-exams-load-2012.html.gz
	output/static/archives/2012/content/nucleus.html.gz
	output/static/archives/2012/content/openminds.html.gz
	output/static/archives/2012/content/percona.html.gz
	output/static/archives/2012/content/schedule-change.html.gz
	output/static/archives/2012/content/vantosh.html.gz
	output/static/archives/2012/content/where.html.gz
	output/static/archives/2012/index.html.gz
	output/static/archives/2012/node.html.gz
	output/static/archives/2012/sites/default/files/css/css_d83a36973dd98745c2eb1afd740bfd82.css.gz
	output/static/archives/2012/sites/default/files/js/js_81c0a1411085f6ee24d12772ec2b9cd4.js.gz
	output/static/archives/2012/sites/default/files/js/js_f0495a49d5f464cbb5fa1729cf7b0f4e.js.gz
	output/static/archives/2012/themes/arthemia/favicon.ico.gz
	output/static/archives/2012/user.1.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F42#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F46#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F55#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F57#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F58#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F59#comment-form.html.gz
	output/static/archives/2012/user/login?destination=comment%2Freply%2F60#comment-form.html.gz
	output/static/archives/2012/user/password.html.gz
	output/static/archives/2012/user/register.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F42#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F46#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F55#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F57#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F58#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F59#comment-form.html.gz
	output/static/archives/2012/user/register?destination=comment%2Freply%2F60#comment-form.html.gz
	output/tag/featured.html.gz
	output/tag/loadays.html.gz
	output/tags.html.gz
	output/theme/css/main.css.gz
	output/theme/css/pygment.css.gz
	output/theme/css/reset.css.gz
	output/theme/css/typogrify.css.gz
	output/theme/css/wide.css.gz