Merge remote-tracking branch 'viktor/master'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 13 Feb 2013 11:52:37 +0000 (12:52 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 13 Feb 2013 11:52:37 +0000 (12:52 +0100)
commita69cc4ec2b8196fe14867cd44c98571adedaba2a
tree4427605b458053984e8f3f454bd7ea36eb6e8bc7
parent0b21bcfcacb823a3d614c5507c0f93cd8b5f101f
parent1d830cd690a8ed09d12c6f11f14d6d9edb6c501c
Merge remote-tracking branch 'viktor/master'

Conflicts:
component/imagemagick/buildout.cfg
component/libtiff/buildout.cfg
component/postgresql/buildout.cfg
setup.py
component/apache/buildout.cfg
component/libtiff/buildout.cfg
component/postgresql/buildout.cfg
setup.py
software/mioga/software.cfg