Merge branch 'master' of /home/angel/git/artemus/
commit2d53a54a2b873e649313e7c881a1ae9cd4946ac0
authorAngel Ortega <angel@triptico.com>
Fri, 19 Sep 2008 15:35:25 +0000 (19 17:35 +0200)
committerAngel Ortega <angel@triptico.com>
Fri, 19 Sep 2008 15:35:25 +0000 (19 17:35 +0200)
treee02362417f9670154ae61797582be805350c179a
parentf7cfe54428125ed6041ec5690a052fa031e9c6b9
parenta2c10ed4c0012cc1a6a83e11af23bd9810864c82
Merge branch 'master' of /home/angel/git/artemus/