Merge branch 'hotfix-3.07.1' into mast3r
commit2795021ae25dec99544e74c2cdef1df28f3b64bd
authorPanagiotis Vossos <panagiotis@vossos.name>
Thu, 13 Jan 2011 17:12:22 +0000 (13 19:12 +0200)
committerPanagiotis Vossos <panagiotis@vossos.name>
Thu, 13 Jan 2011 17:12:22 +0000 (13 19:12 +0200)
treeada063a5f7a9c22f29577168aa94c736198830a0
parentd11c4e4a8ee1906a4e7781ad2a2475008e3f58c8
parentf9ce4350f5487766dd347c3c1c86143d0fdc1e7a
Merge branch 'hotfix-3.07.1' into mast3r