tree 5c36a8f4c6b27f70497011ac7aa4ef38c97e3779
parent be9d1ace364d29c528c83e48f0a861aa272c8368
parent 2329b456f5b07b8a6ee888288ff3d201718a739c
author Lucas De Marchi <lucas.de.marchi@gmail.com> 1318683912 -0300
committer Lucas De Marchi <lucas.de.marchi@gmail.com> 1318683912 -0300

Merge branch 'dict' into v1.2.x