[SCM] ci-tooling packaging branch, master, updated. c847691b5c2876e6fa65170cf9a9b02943893a0c

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=c847691

The following commit has been merged in the master branch:
commit c847691b5c2876e6fa65170cf9a9b02943893a0c
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 12 12:37:05 2015 +0100

    lp: fix documentation
---
 lib/lp.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lp.rb b/lib/lp.rb
index 6b60c2a..b7e3667 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -143,7 +143,7 @@ module Launchpad
 
         def self.from_json(json)
             # Launchpad uses new-style JSON which can be any of the JSON literals
-            # other than object/array. To make the parser pick this up we need
+            # in addition to objects. To make the parser pick this up we need
             # to enable quirks mode.
             return JSON::parse(json, quirks_mode: true, object_class: Rubber)
         end

-- 
ci-tooling packaging