Merge tag 'upstream/2.5'
authorMarius Gavrilescu <marius@ieval.ro>
Fri, 9 Aug 2013 13:21:21 +0000 (16:21 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Fri, 9 Aug 2013 13:21:21 +0000 (16:21 +0300)
Upstream version 2.5


Trivial merge
This page took 0.009974 seconds and 4 git commands to generate.