mathdatech/awesome-python
1
0
Fork 0
mirror of https://github.com/vinta/awesome-python.git synced 2024-11-24 20:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
962 Commits 2 Branches 0 Tags 78 MiB
e1435ce742
Commit Graph

797 Commits

Author SHA1 Message Date
James
12649b44db Splinter link update. Closes #436 2015-08-14 08:46:55 -04:00
Vinta
2a1fc6d236 Merge pull request #432 from muffl0n/typos 
Fixed typo in description of geojson
 2015-08-12 15:47:52 +08:00
muffl0n
387650b69f mutagen has moved to Bitbucket 2015-08-12 09:28:02 +02:00
muffl0n
90738f62f2 Fixed typo in description of geojson 2015-08-12 09:25:14 +02:00
Junjie Tao
b8ba7a3f1d Add PyAutoGUI model at Testing Frameworks 
[PyAutoGUI](https://github.com/asweigart/pyautogui) - 
A cross-platform GUI automation Python module for human beings. Used to programmatically control the mouse & keyboard. Eventually it would be great to offer the same type of features that [Sikuli](http://www.sikuli.org) offers.
 2015-08-11 10:41:12 +08:00
Kishore Narendran
0daa74b9ac Added Awesome badge to README.md 2015-08-07 15:24:04 +07:00
Vinta
5732b0a0c5 remove duplicate Fixes #337 2015-08-07 00:31:03 +08:00
Vinta
36e1ea7f8f update sections 2015-08-07 00:26:27 +08:00
Vinta
24008170c3 refine 2015-08-07 00:08:56 +08:00
Vinta
98caa887e3 add Tomorrow to Concurrency section 2015-08-06 23:27:23 +08:00
Vinta
5105a685f3 Merge remote-tracking branch 'spikergit1/patch-1' 2015-08-06 05:20:38 +08:00
Julian
fb80e9aee0 Delete unmaintained visualizing data libs 
d3py links to vincent
Kartography.py links to mapshaper (node.js)
 2015-07-26 22:46:20 +02:00
Alexander Pyatkin
30eac33231 Add line_profiler to Debugging Tools 2015-07-20 12:21:19 +04:00
Vinta
cb41fcbfd2 Merge pull request #421 from locolupo/master 
adding PyBuilder a continuous build tool written in pure Python
 2015-07-18 23:44:57 +08:00
Vinta
94ef3f6d0f sort some sections 2015-07-15 22:42:13 +08:00
Vinta
132d426964 add Python ZEEF 2015-07-15 22:40:44 +08:00
locolupo
5228fe6979 adding PyBuilder a continuous build tool written in pure Python which mainly targets Python applications. 2015-07-15 14:29:41 +02:00
Frank Sachsenheim
a439f0a9bf Adds Cerberus to Data Validation 
disclaimer: i recently contributed to the project. and i still think it's awesome.
 2015-07-09 05:00:48 +02:00
Vinta
fb09dfcde6 fix tabs 2015-07-07 22:40:20 +08:00
AkashMalhotra
ecc643c131 added new command line example 2015-07-07 09:59:54 -04:00
Vinta
193b01ed3b Merge pull request #413 from kxepal/patch-1 
Add Hypothesis project (property based testing library)
 2015-07-06 16:03:00 +08:00
Vinta
eba29d94bf Merge pull request #409 from timmartin19/patch-1 
Added ripozo to RESTful APIs
 2015-07-06 16:02:30 +08:00
Alexander Shorin
360594135d Add Hypothesis project 2015-07-03 18:20:07 +03:00
Fabian Rost
511d001390 Updating the link to the newest version of PyMC 
The development version of PyMC (version 3) has been moved to its own repository called pymc3.
 2015-07-02 01:00:01 +02:00
Tim Martin
badc21efd9 Forgot the . 2015-07-01 11:30:02 -04:00
Tim Martin
5d53e4c525 Added ripozo to RESTful APIs 2015-07-01 11:29:20 -04:00
Jackmoo
7935630973 Added remote debugging info for winpdb 
Remote debugging capability verified by myself.
 2015-06-29 19:11:35 +08:00
tony
f4682c703f Added Eliot logging system. 2015-06-12 10:21:34 +02:00
Vinta
6b9dfe126f Merge pull request #399 from hargup/bandersnatch 
Add Bandersnatch to Pacakge Repositories list
 2015-06-12 13:54:43 +08:00
Asad Dhamani
7b651a3e5f Fix broken link 2015-06-09 21:53:52 +05:30
Harsh Gupta
a194e61913 Add Bandersnatch to Pacakge Repositories list 2015-06-09 16:12:54 +05:30
Asad Dhamani
d603d244f2 Add IDEs section 2015-06-09 03:56:18 +05:30
Vinta
2917299708 clear up 2015-06-07 03:08:09 +08:00
newman101
ab54a9de32 Couple of typo fixes and amendments 2015-06-04 21:28:18 +01:00
Vinta
dc7217f031 add elasticsearch-dsl-py to Search section 2015-05-30 15:39:18 +08:00
Vinta
16d21af9ea add factory_boy to Testing section 2015-05-30 15:36:11 +08:00
Vinta
4c527900b3 Merge pull request #388 from korzeniewskipl/master 
Add wdb - web debugger through WebSockets.
 2015-05-29 12:11:55 +08:00
Vinta
e7e6ecbc02 remove wsgiref 2015-05-29 12:11:03 +08:00
Vinta
feea3e394a Merge remote-tracking branch 'vovanz/master' 2015-05-29 12:06:10 +08:00
Paweł Korzeniewski
36bf011a65 Add wdb - web debugger through WebSockets. 2015-05-28 22:57:11 +02:00
Madhusudan Banik
d501d7d518 Update README.md 2015-05-26 01:09:24 -07:00
vovanz
4283a4ba2c Formatting fix 2015-05-24 18:39:26 +05:00
vovanz
0eae58065c Add APSW 2015-05-24 18:33:18 +05:00
vovanz
f8dffbd7e3 Add uWSGI to WSGI servers 2015-05-24 18:30:36 +05:00
Li-Ting Tsai
0393589823 move doitlive to Productivity Tools 2015-05-21 08:35:45 +08:00
Li-Ting Tsai
fbdb59da70 add doitlive to Miscellaneous 2015-05-20 08:15:16 +08:00
Vinta
d6929f5918 add PyTime to Date and Time section 2015-05-16 21:11:49 +08:00
Vinta
1acbe0c6bd fix horizontal rule syntax 2015-05-15 22:05:51 +08:00
Vinta
4e62d87e30 Merge pull request #367 from jlevy/s4cmd 
Add s4cmd, a faster S3 command-line tool.
 2015-05-15 02:12:43 +08:00
Vinta
8810d07de1 add p to Environment Management section 2015-05-07 13:09:36 +08:00
Vinta
58295375b4 cut 2015-05-06 01:55:55 +08:00
Akis Kesoglou
8f950187d7 Added django-rules in Permissions section 2015-05-05 12:21:13 +03:00
Joshua Levy
b5c756f1dc Add s4cmd, a faster S3 command-line tool. 2015-05-03 13:14:55 -07:00
Vinta
c6b2dadd24 add thefuck: Correcting your previous console command 2015-05-01 18:37:50 +08:00
Vinta
418eea9caa add langid.py: Stand-alone language identification system 2015-04-30 16:38:55 +08:00
Vinta
985af6ad4c add openpyx Fixes #360 2015-04-25 14:26:53 +08:00
Vinta
4c693e9e3b Merge pull request #355 from dhamaniasad/patch-9 
Add PyFormat
 2015-04-25 13:44:53 +08:00
Eric Lo
24d5536d80 add alipay, An Unofficial Alipay API for Python 2015-04-16 15:14:18 +08:00
Asad Dhamani
5fababb1d3 Add PyFormat 2015-04-15 18:39:21 +05:30
Felipe Ruhland
fc168cc0bd Update fig to docker-compose. 2015-04-15 08:23:43 -03:00
spikergit1
bc362b6e1d Add RobotFramework 2015-04-11 09:59:38 -05:00
Cyrille Rossant
4b42f467a0 Added VisPy 2015-04-10 23:16:13 +02:00
Boban Spiroski
781ed72fad Update link 
The old link pointed to nowhere.
 2015-04-06 17:41:47 +02:00
Boban Spiroski
2bcf1ef35f Removed link 
Pointing to nowhere http://tags.brace.io
 2015-04-01 21:25:38 +02:00
Vinta
169e78ef17 refine 2015-04-01 20:29:34 +08:00
Vinta
7a9a3bd7c7 Merge pull request #333 from jnmclarty/winpython 
Added WinPython
 2015-04-01 20:23:51 +08:00
Nathan Stocks
debf90f64f Update README.md 2015-03-27 12:46:36 -06:00
Roman Salin
fb59f49719 Delete broken link 2015-03-25 00:27:45 +03:00
Jeffrey McLarty
220fcfa389 Remove "python" 
...since it's implied
 2015-03-22 12:54:06 -04:00
Jeffrey McLarty
bfdd515f1b Add WinPython 2015-03-22 12:51:32 -04:00
Vinta
c1ece4e06f fix image url 2015-03-22 02:00:07 +08:00
Alexander Pyatkin
c30ab60497 Correct spelling (woking -> working) 2015-03-17 08:14:48 +04:00
Vinta
b37244be9d REPL 2015-03-16 15:49:10 +08:00
Vinta
dd7b07aa91 refine 2015-03-16 15:46:25 +08:00
Vinta
09beb64afa add unoconv and ReportLab to Specific Formats Processing 2015-03-16 15:42:08 +08:00
Pradipta Bora
197fea6148 Add PythonNet 2015-03-13 12:23:20 +05:30
Pradipta Bora
902465b45f Add PyWin32 Module 2015-03-13 12:19:57 +05:30
quarck
6d73dd6bd1 added Grab to Web Crawling section 2015-03-12 14:23:57 +07:00
Mario Idival
86f6859871 add awesome pyramid 2015-03-08 18:10:13 -03:00
Vinta
1ec23af81a Merge pull request #312 from aspyatkin/patch-3 
Add Supervisor to DevOps Tools section
 2015-03-04 13:26:15 +08:00
Alexander Pyatkin
d113044d3c Add Supervisor to DevOps Tools section 2015-03-03 08:04:03 +04:00
bennynis
3d2f029cae Update README.md 
added ptpython - advanced Python REPL built on top of the prompt_toolkit library
 2015-03-02 15:16:49 +02:00
Vinta
4206dee623 add OCR section 2015-01-23 00:53:30 +08:00
Vinta
6818e5f51e Merge remote-tracking branch 'leogregianin/master' 2015-01-23 00:42:26 +08:00
Vinta
92bf17c725 Merge remote-tracking branch 'hitalex/master' 
Conflicts:
	README.md
 2015-01-23 00:33:09 +08:00
Vinta
b7bca3483c Merge pull request #290 from chhantyal/add/caniusepython3 
add 'caniusepython3'
 2015-01-23 00:04:19 +08:00
Fredrik Håård
33de12ea61 Added hgapi and gitapi 2015-01-05 15:04:55 +00:00
Nar Chhantyal
cf5d129350 add command line util 2015-01-03 00:15:04 +01:00
Vinta
ae1336f4e9 add a link to image 2015-01-02 18:38:09 +08:00
Vinta
f15a9b8c82 add "Upcoming Event" section: PyCon APAC 2015 2015-01-02 18:27:30 +08:00
Vinta
9398ec708d correct jieba's repo URL 2015-01-02 17:11:53 +08:00
dawsonbotsford
ffc665ee68 Spelling correction automated from Dawson's Spelling Bee 2015-01-01 20:58:14 -05:00
Melvin
5126afd20c Added Python hackers 2014-12-31 16:15:52 +05:30
Michael van Bracht
3524dba003 Fix cement URL 2014-12-30 00:32:13 +01:00
Akash Shende
3cee8501ec Add fake2db 2014-12-27 10:47:32 +05:30
Vinta
f690e699f1 Merge pull request #284 from 0xKD/patch-1 
Add entry for Nuitka
 2014-12-26 23:58:45 +08:00
andrej2704
9579017b22 Update README.md 
webargs library for parsing HTTP request arguments
 2014-12-26 12:30:46 +01:00
Kedar
ad9400d46a Add entry for Nuitka 2014-12-21 19:58:23 +05:30
Vinta
3baca9f232 add Import Python Weekly Newsletter to Weekly section 2014-12-09 13:21:32 +08:00
Vinta
3e95311a81 rename Migration Utilities to Compatibility 2014-12-09 00:09:06 +08:00
Vinta
7d526d0695 Merge pull request #261 from dhamaniasad/patch-4 
Add Migration Utilities
 2014-12-09 00:07:26 +08:00
Vinta
d61a427e95 add link to http://neo4j.com/ 2014-12-08 03:09:30 +08:00
Vinta
c7660ce106 add requests-oauthlib 2014-12-08 03:06:35 +08:00
Nar Kumar
d5f0d9b411 remove oauth2 as it is abandoned package 2014-12-04 11:59:33 +01:00
Vinta
419c4ff1bc Merge pull request #271 from dhamaniasad/patch-6 
Add pyes
 2014-12-02 16:36:42 +08:00
Avichal
e5707243ef Update README.md 
added neomodel Object-Graph-Mapper for neo4j graph database
 2014-12-02 13:38:10 +05:30
Asad Dhamani
7038a2db77 Add pyes 2014-11-30 23:39:24 +05:30
leogregianin
9132b86ba1 Layout changes for OCR 
Add tools for Python OCR
 2014-11-28 09:31:08 -03:00
leogregianin
1d5d354622 layout changes 2014-11-28 09:29:00 -03:00
leogregianin
94f3cf73c9 Add tools for OCR 
Subsection tools for Image
 2014-11-28 09:27:41 -03:00
leogregianin
b208acefe0 Add tools for OCR 
Section tools for OCR
 2014-11-28 09:23:23 -03:00
Matthieu OLIVIER
c8a157b40e Rename Feedly 
1.0.0 release of Feedly has been rename to Stream Framework
 2014-11-24 12:00:48 +01:00
molivier
6ba1578a62 Merge remote-tracking branch 'upstream/master' 2014-11-24 11:31:08 +01:00
Akash Shende
74fea6a2e8 Add ReportLab and OpenPyXL 2014-11-23 10:40:59 +05:30
Vinta
8624209bf6 Merge pull request #265 from techtonik/patch-1 
Add debug and move pdb into secondary links
 2014-11-20 04:49:02 +08:00
hitalex@laptop
673626f86d add two python crawling frameworks 2014-11-19 20:46:03 +08:00
anatoly techtonik
5b15054dcb Add debug and move pdb into secondary links 
`pdb` from standard library is not awesome (especially with all these alternatives)
 2014-11-19 13:25:06 +03:00
Asad Dhamani
9cd07a4667 Update README.md 2014-11-18 15:06:18 +05:30
Asad Dhamani
7ed44f42f2 Add pyspider 2014-11-18 15:04:27 +05:30
David
af2c58ccdd Mutagen has moved to bitbucket 2014-11-16 10:12:06 -05:00
Asad Dhamani
aa911437fa Add Migration Utilities 2014-11-15 18:11:08 +05:30
Matthieu OLIVIER
7a8bb7bba8 Update README.md 2014-11-14 10:59:57 +01:00
Geon-U Lee
2c42a93857 Add period when finished sentence. 2014-11-14 15:46:10 +09:00
Vinta
d8fc0a48f4 add PyUserInput to Hardware section 2014-11-12 02:12:31 +08:00
Vinta
230b30287a add sub-sections 2014-11-12 02:11:09 +08:00
filinpavel
3b68b868ee Update README.md 
added pyelftools to debugging section
 2014-11-11 09:35:43 +06:00
Reuben Cummings
509507655c Add flask-restless 
Flask-Restless provides simple generation of ReSTful APIs for database models defined using SQLAlchemy (or Flask-SQLAlchemy). The generated APIs send and receive messages in JSON format.
 2014-10-22 10:44:40 +03:00
Vinta
9dcc3141a8 remove Djaneiro 2014-10-18 01:31:11 +08:00
Vinta
28d2013611 Merge pull request #238 from GeonU/patch-2 
Add awesome-sphinxdoc: a curated list of awesome tools for Sphinx Python Documentation Generator.
 2014-10-16 09:18:29 +08:00
josselex
4ee86eb8a8 added pyqtgraph 2014-10-15 17:38:47 +02:00
josselex
824112912a Revert "added pyqtgraph" 
This reverts commit 6c7c998b33.
 2014-10-15 17:37:42 +02:00
josselex
6c7c998b33 added pyqtgraph 2014-10-15 17:36:28 +02:00
Hyunjun Kim
2b8b2beb88 Add Korean: A library for Korean morphology. 2014-10-14 17:14:43 +09:00
Geon-U Lee
e82926ee13 Add awesome-sphinxdoc. 2014-10-13 16:59:01 +09:00
Vinta
b9ff19243f refine 2014-10-10 16:47:31 +08:00
Vinta
4a72ccb8c0 Merge pull request #237 from DavidJFelix/patch-1 
Add 3 JSON Web signature/token libraries
 2014-10-10 16:39:31 +08:00
Vinta
6929b72d36 Merge pull request #235 from andriykohut/master 
Add YouCompleteMe to Editor Plugins
 2014-10-10 16:35:32 +08:00
Vinta
fe002fe7f8 make a world a better place 2014-10-10 16:34:39 +08:00
Vinta
ff1a50808c Merge remote-tracking branch 'salilnavgire/master' 2014-10-10 16:28:26 +08:00
Wayan Widnyana Putra
bf5a9fe8db add dot 2014-10-10 03:32:25 +07:00
David J. Felix
f779c794a6 Fix typos 2014-10-09 11:22:59 -04:00
David J. Felix
cf972b5fff Add 3 JSON Web signature/token libraries 2014-10-09 11:08:54 -04:00
Wayan Widnyana Putra
c5ddbeb229 add flask-debugtoolbar to Debugging tools 2014-10-09 19:21:20 +07:00
Andriy Kohut
014a4f80f5 Add YouCompleteMe to Editor Plugins 2014-10-09 14:33:35 +03:00
Kakashi Liu
6e121611d2 add profiling to Debugging Tools section 2014-10-09 16:30:41 +08:00
Vinta
01467cd772 Merge pull request #232 from kmonsoor/patch-4 
++ prompt-toolkit for CLI application
 2014-10-09 13:13:12 +08:00
Vinta
c3458513ca add uniout to Text Processing section 2014-10-04 10:36:06 +08:00
Vinta
ce7fc7151c refine again 2014-10-04 10:33:24 +08:00
Vinta
709720e8ea add flywheel to ORM section 2014-10-04 10:28:02 +08:00
Vinta
05f4d3b44b refine 2014-10-04 10:26:52 +08:00
Vinta
c8ef8670d2 add fig to DevOps Tools section 2014-10-04 10:22:15 +08:00
Vinta
8223a6619d remove something 2014-10-04 10:19:47 +08:00
Vinta
e9f18fd52e Merge remote-tracking branch 'Alir3z4/patch-1' 2014-10-04 10:06:15 +08:00
Vinta
b542ac4b71 add awesome-sqlalchemy 2014-10-04 09:59:31 +08:00
Vinta
0125c1e1a1 add TinyDB to Database section 2014-10-04 09:57:35 +08:00
kmonsoor
f92b87727a ++ prompt-toolkit for CLI application 
prompt_toolkit is a Library for building powerful interactive command lines in Python. It ships with a nice interactive Python shell (called ptpython) built on top of the library.
 2014-10-01 01:16:44 +06:00
Alireza Savand
f73075d672 Add sanitize 
Bringing sanity to world of messed-up data.
 2014-09-27 17:35:01 +04:00
Alireza Savand
b3b4085c4c Add short_url 
Python implementation for generating Tiny URL- and bit.ly-like URLs.
 2014-09-27 17:29:34 +04:00
Alireza Savand
5269d867a6 Add django-markwhat 
A collection of template filters that implement common markup languages.
 2014-09-27 17:25:06 +04:00
Alireza Savand
98b159386b Add python-currencies 
Display money format and its filthy currencies, for all money lovers out there.
 2014-09-27 17:21:29 +04:00
Alireza Savand
1af4bc9cfb Add python-stop-words 
Get list of common stop words in various languages in Python.
 2014-09-27 17:19:28 +04:00
filinpavel
cc17e950e8 Update README.md 
Added xlwings in Specific Formats Processing section.
 2014-09-26 21:40:41 +07:00
Salil Navgire
0292e6d507 added Vowpal_porpoise 2014-09-24 13:24:44 -04:00
camarajm
d6806d1d86 Update README.md 
Add PLY project
 2014-09-22 17:46:27 -04:00
Vinta
2739e4abde add django-wordpress to Third-party APIs section 2014-09-19 18:21:42 +08:00
Vinta
a2e124cf7a add Chronyk to Date and Time section 2014-09-19 18:20:30 +08:00
Vinta
7442d92906 add Pychievements to Miscellaneous section 2014-09-19 18:20:08 +08:00
Vinta
c165252193 add blaze to Science and Data Analysis section 2014-09-19 18:17:38 +08:00
Vinta
91eb2a2a4a add radar to Fake Data section 2014-09-19 18:17:22 +08:00
Vinta
b9c018f7a3 add csvkit 2014-09-19 18:11:46 +08:00
Asad Dhamani
1636caa03a Update README.md 2014-09-16 04:32:39 +05:30
Paweł Olejniczak
26502a1450 Add Gunnery 2014-09-10 18:30:27 +02:00
Martín Gaitán
04fff3ae2f added demiurge 
scrapping microframework
 2014-09-06 00:14:28 -03:00
Mischa Peters
439f1b2335 Merge remote-tracking branch 'upstream/master' 2014-09-01 16:41:32 +02:00
Mischa Peters
f5a241d5ef Fixed typo 2014-09-01 16:41:31 +02:00
Vinta
f8ea6a142b rearrange 2014-09-01 18:01:07 +08:00
Vinta
8e964b3339 Merge pull request #215 from Xuefeng-Zhu/patch-4 
Update README.md
 2014-09-01 17:49:52 +08:00
Vinta
b26735aba5 Merge pull request #214 from probar/patch-5 
Added passlib for secure password storage
 2014-09-01 17:49:16 +08:00
Vinta
2a5c56cd52 Merge pull request #213 from mischapeters/master 
Updated with virtualenv for Atom.io
 2014-09-01 17:48:23 +08:00
Vinta
4f0ca6d8ab Merge pull request #210 from probar/patch-4 
Update README.md
 2014-09-01 17:47:09 +08:00
Vinta
152b856c86 Merge pull request #209 from samoturk/bio_and_chemo_inf 
Added some chemo and bio informatics libraries
 2014-09-01 17:45:25 +08:00
samoturk
2d49336fd2 Added bcbb and bcbio-nextgen to Science and Data Analysis 2014-08-29 11:52:12 +02:00
Xuefeng Zhu
4b139beb11 Update README.md 2014-08-28 14:31:17 -05:00
probar
c6b1e27db5 Update README.md 2014-08-28 20:27:36 +02:00
Mischa Peters
e08b5fb2cc Updated with virtualenv-api 2014-08-27 09:28:01 +02:00
Mischa Peters
901c9704bc Updated with virtualenv for Atom.io 2014-08-27 08:59:52 +02:00
Vinta
85ff7c2fbd Merge pull request #211 from syndbg/master 
Added Atom plugins
 2014-08-27 13:45:56 +08:00
Vinta
b7b11cdc9d Merge pull request #212 from claytonaalves/master 
Updated python-docx repo link.
 2014-08-27 13:44:39 +08:00
Clayton A. Alves
8354437388 Updated python-docx repo link. 2014-08-26 09:52:46 -04:00
Anton Antonov
3d8e46a6bb Added Atom plugins 2014-08-25 18:31:01 +03:00
probar
8e48532374 Update README.md 2014-08-25 16:58:46 +02:00
samoturk
1aeb4508fa Added: orange, RDKit, Open Babel, cclib and Biopython 2014-08-25 11:25:54 +02:00
probar
39a10d856c Update README.md 2014-08-24 19:01:45 +02:00
Vinta
0306e9eb55 Merge pull request #55 from Alir3z4/patch-1 
Update html2text repo URL
 2014-08-23 19:01:47 +08:00
Vinta
5df238b9bf cut words 2014-08-23 18:57:08 +08:00
Vinta
4154d76f5c Merge commit 'e94c0bd5cabf7884991a2571c69e37844af3f091' 2014-08-23 18:44:28 +08:00
Vinta
558d929912 Merge commit 'c1baa03140a7641001035703497e475438b48b2c' 
Fixed
 2014-08-23 18:36:36 +08:00
Vinta
68afe2c507 fix 2014-08-23 18:33:34 +08:00
Vinta
b9dc633642 Merge commit 'e4c28b6abc79a9c9bd015e21723b0e848cf271aa' 2014-08-23 18:29:48 +08:00
Vinta
bd54c813e3 Merge remote-tracking branch 'andrej2704/master' 
Conflicts:
	README.md

Fixed
 2014-08-23 18:24:56 +08:00