tree 67c642cac6a03f15471708d554a8b6ef42def292
parent ade6a64be3da48f738898d3165e9357ed9faa8f9
parent 9cd46bf68203a8dfe8b42ccd10c05e1b0daee45b
author Borislav Kapukaranov <b.kapukaranov@gmail.com> 1326387320 +0200
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> 1326387320 +0200

Merge remote branch 'origin/master' into 364571-introduce-nano