Merge branch '1.1.x' of https://github.com/NiR-/ruby-lxc into NiR--1.1.x

.travis.yml

@@ -5,12 +5,11 @@ rvm:
   - 2.1.0
 branches:
   only:
-    - master
+    - 1.1.x
 before_install:
   - sudo apt-get update -y
   - sudo apt-get install -y python-software-properties
-  - sudo add-apt-repository -y ppa:ubuntu-lxc/daily
   - sudo apt-get update -y
-  - sudo apt-get install -y liblxc0 lxc lxc-dbg lxc-dev lxc-templates lxc-tests lxctl python3-lxc
+  - sudo apt-get install -y liblxc0
 script:
   - bundle exec rake clean package

ruby-lxc.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.extensions = 'ext/lxc/extconf.rb'
   s.has_rdoc   = true
 
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "rdoc-data"
   s.add_development_dependency "rake-compiler"
 
   s.homepage    = 'https://github.com/lxc/ruby-lxc'