Merge branch 'master' of github.com:Nitri0/prometeo-abc
authorHomero Hernandez <hsh283@gmail.com>
Fri, 12 Jul 2013 13:47:08 +0000 (09:17 -0430)
committerHomero Hernandez <hsh283@gmail.com>
Fri, 12 Jul 2013 13:47:08 +0000 (09:17 -0430)
commitc4853eeac70ab159ec5b0ec3a3942136b9bae4d7
treed9de33d9ab0bd56dca7613266b66dc389e62cab5
parente0533797b409890276d91a40710623b870d3f3a4
parent94783da8f672b6c041203eba5d3c6313dcd0d358
Merge branch 'master' of github.com:Nitri0/prometeo-abc

Conflicts:
prometeo/prometeo-abc.blend
debian/control