| commit | bc80187633249cd2af48381ea07b1783184bd7ab | [log] [tgz] |
|---|---|---|
| author | ddekany <ddekany@freemail.hu> | Sun Aug 31 23:33:23 2014 +0200 |
| committer | ddekany <ddekany@freemail.hu> | Sun Aug 31 23:33:23 2014 +0200 |
| tree | f5313d75960dc0053f016cac9e5c3d0572041025 | |
| parent | 053c6b8852e22a76f10c0bb7ccaa9c2232377b23 [diff] | |
| parent | 99b1cc8ca37cb05bf8b766bd7218dee5f2a1e588 [diff] |
Merge branch '2.3-gae' into 2.3 Conflicts: build.xml