Merge tag 'upstream/2.7'
authorDinko Korunic <kreator@carnet.hr>
Thu, 15 Aug 2013 17:33:08 +0000 (19:33 +0200)
committerDinko Korunic <kreator@carnet.hr>
Thu, 15 Aug 2013 17:33:08 +0000 (19:33 +0200)
commitff0e686ac67bbd82b60c277eb324910dbc60f65f
tree03f0845e25653f9349f7cdd11804fd3799892c63
parent33a81e69474ae91ecec4e991debe59e26bb330fd
parent6ef2f786c6c8ead94841b5f93baf9f43421f08c8
Merge tag 'upstream/2.7'

Upstream version 2.7