commit c1ed8d13bf7bdef1ca94afcaaaea60fe8f714c40 Merge: 0f4a5f0 c2711d6 Author: Florencia Fotorello <ffotorel at redhat.com> Date: Wed Aug 29 00:10:22 2012 -0300 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/mongoose into el6 Conflicts: mongoose.spec sources ---