Merge commit 'origin/core-1.0.2' into core
authorVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 15 Nov 2009 23:05:38 +0000 (00:05 +0100)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 15 Nov 2009 23:05:38 +0000 (00:05 +0100)
commit05a1c4f2c2d7efe05351354b6fd660a1b5fd357b
tree969bd05345fa736c914ea21a594d775879bfa928
parentd38df00e1a642351bf5db2eec61a86adf2052361
parent47a44ed04982abfee731ded1921cbf49f9926db9
Merge commit 'origin/core-1.0.2' into core