Merge commit 'origin/platal-0.10.0'
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 00:07:11 +0000 (02:07 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 00:07:11 +0000 (02:07 +0200)
Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
1  2 
core
modules/admin.php
modules/axletter.php

diff --cc core
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e94c4a1713cc0d63508a5d0ecd2d572f047975fb
 -Subproject commit 82ccb5452cd953d71c49e0075d9ecbbb2f6b5456
++Subproject commit e8ddc3f28701273de2b5c0f822146ab2a39dea91
Simple merge
Simple merge