diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:31:42 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:31:42 +0100 |
| commit | 8a51f885b1bfdb816088837cd4443511bd77ed7a (patch) | |
| tree | bceed829e8b938c0a5e3ee4cb3869d370aba2cfc /license.txt | |
| parent | f51e13f80b5539c329e43abc6004c5576862a27c (diff) | |
| parent | 002b4be248e448227a718e6f7d9ee39ccc575745 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-issue-499
Diffstat (limited to 'license.txt')
0 files changed, 0 insertions, 0 deletions