From 6870fea83d22d58502d856c9fe17338e57859ed5 Mon Sep 17 00:00:00 2001
From: Muriel de Souza Godoi <muriel@laptop.org>
Date: Thu, 19 Jul 2007 21:34:43 +0000
Subject: Merge branch 'master' of git+ssh://murielgodoi@dev.laptop.org/git/projects/memorygame

Conflicts:

	games/capitals/capitals.mem

nothing to commit
---
--
cgit v0.9.1