Merge branch '4.2'
authorDmitry Risenberg <dmitry.risenberg@gmail.com>
Thu, 17 Mar 2011 20:47:05 +0000 (23:47 +0300)
committerDmitry Risenberg <dmitry.risenberg@gmail.com>
Thu, 17 Mar 2011 20:47:05 +0000 (23:47 +0300)
commite528fb947c7fa2bf107304f18a01f067b9f1322c
tree6a9d3408eb576bc64323ae43b589e4af33687905
parent69a240e7d89ec7dfff22fab9438ce69fc16a9286
parent8f31a28e1a2a307c6633d0fbe00e98b5e3c10934
Merge branch '4.2'