tree d7d60747ec9fbd13d827f2c70289f8f17b0e3c07
parent 24cc3fec1a99165026970885f098941e204fd8f7
parent 947dcd6886b43d43e5e0925cbc6561f0cc1e5e4a
author Yaroslav Luzin <jardev@gmail.com> 1340697124 +0300
committer Yaroslav Luzin <jardev@gmail.com> 1340697124 +0300

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