Merge branch 'master' into experimental apoc/experimental
authorMatthias Hecker <apoc@sixserv.org>
Tue, 19 Nov 2013 12:38:50 +0000 (12:38 +0000)
committerMatthias Hecker <apoc@sixserv.org>
Tue, 19 Nov 2013 12:38:50 +0000 (12:38 +0000)
commita1a5765288161cb65611cb18f7f00bc8290f1d58
tree0eed6553280e35e269b3bcba280e4cb3cd6bd2ed
parent276d0f4b7681e04d8f05f0e983a0e156ef899616
parent3a6abd145f03aee8bcf1e3aab38f94e80860b18d
Merge branch 'master' into experimental
lib/rbot/plugins.rb