tree c26ed8b161462ed9f6840530f078566968e82b1d
parent c64a8a7489a4a45f0644097834adb48bfb7e66c6
parent 7ce31984166ab15d8e517b7def6f313a68dd96d3
author Yaroslav Luzin <jardev@gmail.com> 1336678464 +0300
committer Yaroslav Luzin <jardev@gmail.com> 1336678464 +0300

Merge branch '42cc_2886' of ssh://git.code.sf.net/p/allura/git into 42cc_2886