summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2013-09-24 20:48:36 (GMT)
committerErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2013-09-24 20:48:36 (GMT)
commit4b10dc637a62b53d60ddf1e18274fbee89a26a6b (patch)
treea567c93fd62cb644f136c7c64243fa4cdae69b51 /README.rst
parentc0bf0be5658fdf3af27da5d1827ef8d156bf9145 (diff)
parentb6457768e7feec8ca8ad0f6535f8fc91b046c799 (diff)
Merge branch 'master' into develop
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions