Merge branch 'develop' of github-kali.github.com:kalikaneko/leap_common into develop
authorKali Kaneko <kali@leap.se>
Wed, 20 Mar 2013 15:27:20 +0000 (00:27 +0900)
committerKali Kaneko <kali@leap.se>
Wed, 20 Mar 2013 15:27:20 +0000 (00:27 +0900)
1  2 
src/leap/common/files.py

Simple merge