Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:58:03 +0000 (18:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:58:03 +0000 (18:58 +0200)
commit070a1bf23fe11397da0d8679e04ec1e5a2b37781
tree4d3c1f11aaa786b16c1c074a08cf6bff5df72b8c
parent288ba37a56f45f4dfe5cc7c9b502619023cd314c
parentfb33dd961136de548236abd8eb37126d0e31c9a7
Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle