Merge branch 'master' of gitorious.org:aster/aster
authorAZ Huang <azhuang@0xlab.org>
Mon, 25 Jul 2011 03:49:11 +0000 (11:49 +0800)
committerAZ Huang <azhuang@0xlab.org>
Mon, 25 Jul 2011 03:49:11 +0000 (11:49 +0800)
commit277fa82fdd6da68f0a6b3d987d544aaa0ade6281
tree27a67e4a20bf9a17f652eb9aad283c959e7f1e56
parent2853c107304b8e4c3dc454b3ef7ffe3101c9734b
parente11ce73b9da1bc2a267900d35fa927bfc1a3a3d0
Merge branch 'master' of gitorious.org:aster/aster