| commit | 66d197c9ed6524bf27979462659170baaadf32dc | [log] [tgz] |
|---|---|---|
| author | Yaroslav Luzin <jardev@gmail.com> | Wed May 16 18:31:54 2012 +0300 |
| committer | Yaroslav Luzin <jardev@gmail.com> | Wed May 16 18:31:54 2012 +0300 |
| tree | 9f41314aef24c7da8ac6ebeb24a2623b5de0e530 | |
| parent | ecf057406a63cd92f5473240d8477b43db0671a6 [diff] | |
| parent | 4d7545c7341dcd52ff3dea00f72ea7815cf447cc [diff] |
Merge branch 'dev' into t48_blog_pull_in_rss Conflicts: Allura/allura/command/__init__.py Allura/allura/tests/test_commands.py Allura/setup.py