From 2242ea0a5b437842276cba36b1e30a7668d5b661 Mon Sep 17 00:00:00 2001
From: Alexandre Antonino Gonçalves Martinazzo <alexandremartinazzo@gmail.com>
Date: Thu, 23 Aug 2007 22:41:57 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/oficina

Conflicts:

	NEWS
---
(limited to 'Desenho.py')

--
cgit v0.9.1