tree b0c27433f41127203b9e8677f7be22b0bcc188cd
parent 116c0cce26cae1075b91de6f0ed1fb11c8b729f3
parent 247b8f6e86af963b1a230f58f60593527a3a657d
author ddekany <ddekany@freemail.hu> 1411943461 +0200
committer ddekany <ddekany@freemail.hu> 1411943461 +0200

Merge branch '2.3-gae' into 2.3