diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-18 13:27:30 -0500 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-18 13:27:30 -0500 |
| commit | a55fefdd78ac984b366c8e1701cbbd8f5ad18e97 (patch) | |
| tree | 528927e45c4ff8d4bbc0b3850da10454f12baeb3 /doc | |
| parent | 4673afddcb5a1069f75fb3493e43498ed1de11f9 (diff) | |
| parent | 5dfa5ce7d1374509fea51f8d0b132ea865f34dc6 (diff) | |
Merging trunk to my branch. Fixed conflicts in Authors file and .mailmap.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions