| commit | cc965eb38e038ebb5f93225996fd9aa5cabdd3d4 | [log] [tgz] |
|---|---|---|
| author | olim7t <omichallat+github@gmail.com> | Tue Aug 26 17:26:03 2014 +0200 |
| committer | olim7t <omichallat+github@gmail.com> | Tue Aug 26 17:26:03 2014 +0200 |
| tree | e09de8d63c0e4eda51385ec08bb11bfce5ff22eb | |
| parent | 8f51a1d8d844930271a4b986670526bda6c1126d [diff] | |
| parent | 26010b330ad37bcd44090da6d12c021aaaabd911 [diff] |
Merge branch '2.0' into 2.1